Skip to content

Commit be0cde1

Browse files
committed
undo
1 parent c5b859a commit be0cde1

2 files changed

Lines changed: 9 additions & 36 deletions

File tree

builtins/civetweb/0001-message-libs.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

builtins/civetweb/CMakeLists.txt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ ExternalProject_Add(BUILTIN_CIVETWEB
8383
USES_TERMINAL_INSTALL true
8484
USES_TERMINAL_TEST true
8585
INSTALL_DIR ${ROOT_CIVETWEB_PREFIX}
86-
PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/0001-message-libs.patch
8786
CMAKE_ARGS -G ${CMAKE_GENERATOR}
88-
-DCMAKE_VERBOSE_MAKEFILE=ON
8987
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
9088
-DCMAKE_INSTALL_LIBDIR:PATH=<INSTALL_DIR>/lib
9189
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -102,16 +100,16 @@ ExternalProject_Add(BUILTIN_CIVETWEB
102100
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
103101
-DCIVETWEB_ENABLE_WEBSOCKETS=ON
104102
-DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
105-
-DOPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY}
106-
-DOPENSSL_SSL_LIBRARY=${OPENSSL_SSL_LIBRARY}
103+
#-DOPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY}
104+
#-DOPENSSL_SSL_LIBRARY=${OPENSSL_SSL_LIBRARY}
107105
-DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES}
108-
-DCMAKE_PREFIX_PATH:STRING=${OPENSSL_PREFIX}
109-
-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
110-
-DOPENSSL_FOUND=TRUE
111-
-DOpenSSL_FOUND=TRUE
112-
-DOpenSSL_ROOT=${OPENSSL_ROOT} #For CMake <3.27
113-
-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
114-
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
106+
#-DCMAKE_PREFIX_PATH:STRING=${OPENSSL_PREFIX}
107+
#-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
108+
#-DOPENSSL_FOUND=TRUE
109+
#-DOpenSSL_FOUND=TRUE
110+
#-DOpenSSL_ROOT=${OPENSSL_ROOT} #For CMake <3.27
111+
#-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
112+
#-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
115113
# -DCMAKE_INSTALL_RPATH:STRING=${rpath_origin}
116114
${ROOT_SSL_API}
117115
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_CIVETWEB_BUILD_COMMAND_FLAGS}

0 commit comments

Comments
 (0)