Changeset: 5dd98a3af1f3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5dd98a3af1f3
Modified Files:
cmake/Modules/FindUUID.cmake
ctest/cmake/detect-gdal.cmake
ctest/cmake/detect-snappy.cmake
Branch: Oct2020
Log Message:
both snappy and gdal exist in fedora 32
improved detection of uuid_generate
diffs (36 lines):
diff --git a/cmake/Modules/FindUUID.cmake b/cmake/Modules/FindUUID.cmake
--- a/cmake/Modules/FindUUID.cmake
+++ b/cmake/Modules/FindUUID.cmake
@@ -19,6 +19,8 @@ if(NOT UUID_LIBRARIES)
set(UUID_LIBRARIES "" CACHE INTERNAL "uuid libraries path")
endif()
# Find uuid_generate symbol, which we require and some platforms don't have it
+set(CMAKE_REQUIRED_LIBRARIES ${UUID_LIBRARIES})
+set(CMAKE_REQUIRED_INCLUDES ${UUID_INCLUDE_DIR})
check_symbol_exists("uuid_generate" "uuid/uuid.h" HAVE_UUID_GENERATE)
cmake_pop_check_state()
diff --git a/ctest/cmake/detect-gdal.cmake b/ctest/cmake/detect-gdal.cmake
--- a/ctest/cmake/detect-gdal.cmake
+++ b/ctest/cmake/detect-gdal.cmake
@@ -41,7 +41,7 @@ elseif(${LINUX_DISTRO} STREQUAL "fedora"
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "32")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_SHP
variablename GDAL_FOUND)
endif()
diff --git a/ctest/cmake/detect-snappy.cmake b/ctest/cmake/detect-snappy.cmake
--- a/ctest/cmake/detect-snappy.cmake
+++ b/ctest/cmake/detect-snappy.cmake
@@ -45,7 +45,7 @@ elseif(${LINUX_DISTRO} STREQUAL "fedora"
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "32")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_SNAPPY
variablename SNAPPY_FOUND)
endif()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
