Changeset: 3d8de3833a6e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d8de3833a6e
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Set the libraries only if the version found is higher than the required.
diffs (35 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -813,7 +813,7 @@ if(NOT ${WITH_LZ4} STREQUAL "NO")
message(STATUS "lz4 library not found")
endif()
endif()
-if(NOT LZ4_FOUND)
+if(NOT HAVE_LIBLZ4)
set(LZ4_INCLUDE_DIR "")
set(LZ4_LIBRARIES "")
endif()
@@ -827,11 +827,9 @@ if(NOT MATH_LIBRARIES)
set(MATH_LIBRARIES "" CACHE STRING "m library to link")
endif()
if(WIN32)
- find_library(PSAPI_LIBRARIES NAMES psapi DOC "psapi library to link
(only on Windows)")
+ set(PSAPI_LIBRARIES "psapi")
endif()
-if(NOT PSAPI_LIBRARIES)
- set(PSAPI_LIBRARIES "" CACHE STRING "psapi library to link (only on
Windows)")
-endif()
+set(PSAPI_LIBRARIES "${PSAPI_LIBRARIES}" CACHE STRING "psapi library to link
(only on Windows)")
# Malloc libs
set(MALLOC_LIBRARIES "")
@@ -1678,7 +1676,7 @@ if(NOT ${ENABLE_NETCDF} STREQUAL "NO") #
message(FATAL_ERROR "netcdf library required for NetCDF
support")
endif()
endif()
-if(NOT NETCDF_FOUND)
+if(NOT HAVE_NETCDF)
set(NETCDF_INCLUDE_DIR "")
set(NETCDF_LIBRARIES "")
endif()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
