Skip to content

Commit c928e31

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

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

builtins/civetweb/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ 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()
7368

7469
ExternalProject_Add(BUILTIN_CIVETWEB
7570
PREFIX ${ROOT_CIVETWEB_PREFIX}
@@ -89,7 +84,7 @@ ExternalProject_Add(BUILTIN_CIVETWEB
8984
USES_TERMINAL_TEST true
9085
INSTALL_DIR ${ROOT_CIVETWEB_PREFIX}
9186
PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/0001-message-libs.patch
92-
CMAKE_ARGS -G ${ROOT_GENERATOR}
87+
CMAKE_ARGS -G ${CMAKE_GENERATOR}
9388
-DCMAKE_VERBOSE_MAKEFILE=ON
9489
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
9590
-DCMAKE_INSTALL_LIBDIR:PATH=<INSTALL_DIR>/lib
@@ -119,7 +114,7 @@ ExternalProject_Add(BUILTIN_CIVETWEB
119114
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
120115
# -DCMAKE_INSTALL_RPATH:STRING=${rpath_origin}
121116
${ROOT_SSL_API}
122-
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_CIVETWEB_BUILD_COMMAND_FLAGS} --target civetweb-c-library -- -j1 -v
117+
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_CIVETWEB_BUILD_COMMAND_FLAGS}
123118
INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_CIVETWEB_BUILD_COMMAND_FLAGS} --target install
124119
BUILD_BYPRODUCTS
125120
${ROOT_CIVETWEB_LIBRARY}

0 commit comments

Comments
 (0)