[celix] branch feature/civetweb_integration updated: Use find module to get civetweb.

[pengzheng]

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch feature/civetweb_integration
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/feature/civetweb_integration 
by this push:
     new 389846bc Use find module to get civetweb.
389846bc is described below

commit 389846bca603a329a73357bd416f82c403c4c75b
Author: PengZheng <howto...@gmail.com>
AuthorDate: Sat Feb 4 15:26:09 2023 +0800

    Use find module to get civetweb.
---
 .github/workflows/macos.yml            | 3 +--
 CMakeLists.txt                         | 4 +++-
 cmake/AddGTest.cmake                   | 1 +
 cmake/{Modules => }/Findcivetweb.cmake | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index cf8157ed..e494d7ad 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -65,14 +65,13 @@ jobs:
           brew install lcov zeromq czmq cpputest jansson rapidjson libzip
       - name: Build
         env:
-          #syslog disabled and Release not use because of #471
+          # Release not use because of #471
           BUILD_OPTIONS: |
             -DENABLE_TESTING=ON
             -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
             -DENABLE_TESTING_FOR_CXX14=ON
             -DENABLE_ADDRESS_SANITIZER=ON
             -DCMAKE_BUILD_TYPE=Debug
-            -DBUILD_SYSLOG_WRITER=OFF
         run: |
           mkdir build install
           cd build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51af284f..4b65d2bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,8 @@ project (Celix C CXX ASM)
 include(cmake/celix_project/CelixProject.cmake)
 include(cmake/cmake_celix/UseCelix.cmake)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
 #find required packages
 find_package(ZLIB REQUIRED) #framework
 find_package(libuuid REQUIRED) #framework
@@ -74,7 +76,7 @@ option(ENABLE_TESTING "Enables unit/bundle testing" FALSE)
 if (ENABLE_TESTING)
     find_package(GTest QUIET)
     if (NOT GTest_FOUND)
-        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddGTest.cmake)
+        include(AddGTest)
     endif()
 endif ()
 
diff --git a/cmake/AddGTest.cmake b/cmake/AddGTest.cmake
index da9e6033..f68116a5 100644
--- a/cmake/AddGTest.cmake
+++ b/cmake/AddGTest.cmake
@@ -19,6 +19,7 @@ include(FetchContent)
 FetchContent_Declare(
         googletest
         GIT_REPOSITORY https://github.com/google/googletest.git
+#        GIT_REPOSITORY https://gitee.com/mirrors/googletest.git
         GIT_TAG        release-1.11.0
 )
 FetchContent_MakeAvailable(googletest)
\ No newline at end of file
diff --git a/cmake/Modules/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
similarity index 95%
rename from cmake/Modules/Findcivetweb.cmake
rename to cmake/Findcivetweb.cmake
index cd3017af..33f449bb 100644
--- a/cmake/Modules/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -23,6 +23,7 @@ if (NOT civetweb_FOUND)
     FetchContent_Declare(
             civetweb
             GIT_REPOSITORY https://github.com/civetweb/civetweb.git
+#            GIT_REPOSITORY https://gitee.com/mirrors/civetweb.git
             GIT_TAG        eefb26f82b233268fc98577d265352720d477ba4 # V1.15
     )
     FetchContent_MakeAvailable(civetweb)