Skip to content

Commit 864e0f6

Browse files
authored
Update CMakeLists.txt
1 parent d0a8d47 commit 864e0f6

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

builtins/civetweb/CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ endif()
6565
if (CMAKE_OSX_SYSROOT)
6666
set(ROOT_C_FLAGS "${ROOT_C_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
6767
endif()
68+
if(APPLE)
69+
set(ROOT_GENERATOR "Unix Makefiles")
70+
else()
71+
set(ROOT_GENERATOR ${CMAKE_GENERATOR})
72+
endif()
6873

6974
ExternalProject_Add(BUILTIN_CIVETWEB
7075
PREFIX ${ROOT_CIVETWEB_PREFIX}
@@ -84,7 +89,7 @@ ExternalProject_Add(BUILTIN_CIVETWEB
8489
USES_TERMINAL_TEST true
8590
INSTALL_DIR ${ROOT_CIVETWEB_PREFIX}
8691
PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/0001-message-libs.patch
87-
CMAKE_ARGS -G ${CMAKE_GENERATOR}
92+
CMAKE_ARGS -G ${ROOT_GENERATOR}
8893
-DCMAKE_VERBOSE_MAKEFILE=ON
8994
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
9095
-DCMAKE_INSTALL_LIBDIR:PATH=<INSTALL_DIR>/lib
@@ -114,8 +119,8 @@ ExternalProject_Add(BUILTIN_CIVETWEB
114119
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
115120
# -DCMAKE_INSTALL_RPATH:STRING=${rpath_origin}
116121
${ROOT_SSL_API}
117-
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_CIVETWEB_BUILD_COMMAND_FLAGS} -- -j1 -v
118-
INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_CIVETWEB_BUILD_COMMAND_FLAGS} --target install -- -v
122+
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_CIVETWEB_BUILD_COMMAND_FLAGS} --target civetweb-c-library -- -j1 -v
123+
INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_CIVETWEB_BUILD_COMMAND_FLAGS} --target install
119124
BUILD_BYPRODUCTS
120125
${ROOT_CIVETWEB_LIBRARY}
121126
TIMEOUT 600

0 commit comments

Comments
 (0)