Changeset: 7eeb40ae97fe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7eeb40ae97fe
Modified Files:
CMakeLists.txt
common/utils/CMakeLists.txt
Branch: cmake-fun
Log Message:
Missed check, plus link libraries only on Windows.
diffs (38 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -814,6 +814,8 @@ if(NOT COMMONCRYPTO_FOUND)
set(HAVE_SHA384_UPDATE ON)
set(HAVE_SHA512_UPDATE ON)
else()
+ set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${CRYPTO_INCLUDE_DIR}")
+ set(CMAKE_REQUIRED_LIBRARIES
"${CMAKE_REQUIRED_LIBRARIES};${CRYPTO_LIBRARIES}")
check_symbol_exists("MD5_Update" "openssl/md5.h"
HAVE_MD5_UPDATE)
check_symbol_exists("RIPEMD160_Update"
"openssl/ripemd.h" HAVE_RIPEMD160_UPDATE)
check_symbol_exists("SHA1_Update" "openssl/sha.h"
HAVE_SHA1_UPDATE)
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -20,12 +20,14 @@ if(WIN32)
add_library(mcrypt SHARED ${MCRYPT_OBJECTS})
target_compile_definitions(mcrypt PRIVATE LIBMAPI LIBMCRYPT)
+ target_link_libraries(mcrypt PRIVATE ${CRYPTO_LIBRARIES})
install(TARGETS mcrypt DESTINATION ${LIBDIR})
install(FILES $<TARGET_PDB_FILE:mcrypt> DESTINATION ${LIBDIR} OPTIONAL)
add_library(msabaoth SHARED ${MSABAOTH_OBJECTS})
target_compile_definitions(msabaoth PRIVATE LIBMSABAOTH LIBMUUID LIBMAL
LIBATOMS LIBKERNEL LIBOPTIMIZER LIBSCHEDULER
LIBMONETDB5)
+ target_link_libraries(msabaoth PRIVATE ${CRYPTO_LIBRARIES} mutils)
install(TARGETS msabaoth DESTINATION ${LIBDIR})
install(FILES $<TARGET_PDB_FILE:msabaoth> DESTINATION ${LIBDIR}
OPTIONAL)
else()
@@ -39,7 +41,4 @@ else()
set_target_properties(msabaoth PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
-target_link_libraries(mcrypt PRIVATE ${CRYPTO_LIBRARIES})
-target_link_libraries(msabaoth PRIVATE ${CRYPTO_LIBRARIES} mutils)
-
install(FILES matomic.h DESTINATION ${INCLUDEDIR}/monetdb)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
