Changeset: 7389e7d623d7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7389e7d623d7
Added Files:
ctest/cmake/detect-bz2.cmake
ctest/cmake/detect-commoncrypto.cmake
ctest/cmake/detect-curl.cmake
ctest/cmake/detect-iconv.cmake
ctest/cmake/detect-libz.cmake
ctest/cmake/detect-lz4.cmake
ctest/cmake/detect-openssl.cmake
ctest/cmake/detect-pcre.cmake
ctest/cmake/detect-proj.cmake
ctest/cmake/detect-xml.cmake
ctest/cmake/test_detect_bz2.c.in
ctest/cmake/test_detect_commoncrypto.c.in
ctest/cmake/test_detect_curl.c.in
ctest/cmake/test_detect_iconv.c.in
ctest/cmake/test_detect_libz.c.in
ctest/cmake/test_detect_lz4.c.in
ctest/cmake/test_detect_openssl.c.in
ctest/cmake/test_detect_pcre.c.in
ctest/cmake/test_detect_proj.c.in
ctest/cmake/test_detect_xml.c.in
Removed Files:
ctest/cmake/test_detect.c
ctest/cmake/test_detect_bz2.c
ctest/cmake/test_detect_curl.c
ctest/cmake/test_detect_libz.c
ctest/cmake/test_detect_lz4.c
ctest/cmake/test_detect_pcre.c
ctest/cmake/test_detect_proj.c
Modified Files:
cmake/monetdb-functions.cmake
ctest/cmake/CMakeLists.txt
monetdb_config.h.in
monetdb_config_win32.h.in
Branch: mbedded
Log Message:
fix bugs in library detection and add tests
diffs (truncated from 1143 to 300 lines):
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -119,18 +119,22 @@ function(monetdb_cmake_summary)
message(STATUS "Linux distro: ${LINUX_DISTRO}")
message(STATUS "Linux distro version: ${LINUX_DISTRO_VERSION}")
endif()
+ message(STATUS "Iconv library: ${Iconv_FOUND}")
+ message(STATUS "Pthread library: ${CMAKE_USE_PTHREADS_INIT}")
+ message(STATUS "Pcre library: ${PCRE_FOUND}")
+ message(STATUS "Openssl library: ${OPENSSL_FOUND}")
+ message(STATUS "Commoncrypto library: ${COMMONCRYPTO_FOUND}")
+ message(STATUS "Bz2 library: ${BZIP2_FOUND}")
+ message(STATUS "Curl library: ${CURL_FOUND}")
+ message(STATUS "Lzma library: ${LIBLZMA_FOUND}")
+ message(STATUS "Libxml2 library: ${LIBXML2_FOUND}")
+ message(STATUS "Zlib library: ${ZLIB_FOUND}")
+ message(STATUS "Lz4 library: ${LZ4_FOUND}")
+ message(STATUS "Proj library: ${PROJ_FOUND}")
message(STATUS "Geos library: ${GEOS_FOUND}")
message(STATUS "Gdal library: ${GDAL_FOUND}")
- message(STATUS "Lzma library: ${LZMA_FOUND}")
- message(STATUS "Libxml2 library: ${LIBXML2_FOUND}")
- message(STATUS "Curl library: ${CURL_FOUND}")
- message(STATUS "Bz2 library: ${BZ2_FOUND}")
- message(STATUS "Zlib library: ${LIBZ_FOUND}")
- message(STATUS "Proj library: ${PROJ_FOUND}")
- message(STATUS "Lz4 library: ${LZ4_FOUND}")
message(STATUS "Cfitsio library: ${CFITSIO_FOUND}")
message(STATUS "Kvm library: ${KVM_FOUND}")
- message(STATUS "Pcre library: ${PCRE_FOUND}")
message(STATUS "Netcdf library: ${NETCDF_FOUND}")
message(STATUS "Readline library: ${READLINE_FOUND}")
message(STATUS "-----------------------------------------")
diff --git a/ctest/cmake/CMakeLists.txt b/ctest/cmake/CMakeLists.txt
--- a/ctest/cmake/CMakeLists.txt
+++ b/ctest/cmake/CMakeLists.txt
@@ -16,55 +16,23 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
get_os_release_info(LINUX_DISTRO LINUX_DISTRO_VERSION)
endif()
-add_executable(test_detect test_detect.c)
-target_link_libraries(test_detect
- PRIVATE
- monetdb_config_header)
-add_test(testDetect test_detect)
-
-add_executable(test_detect_pcre test_detect_pcre.c)
-target_link_libraries(test_detect_pcre
- PRIVATE
- monetdb_config_header)
-add_test(testDetectPcre test_detect_pcre)
-
-add_executable(test_detect_bz2 test_detect_bz2.c)
-target_link_libraries(test_detect_bz2
- PRIVATE
- monetdb_config_header)
-add_test(testDetectBz2 test_detect_bz2)
-
-add_executable(test_detect_curl test_detect_curl.c)
-target_link_libraries(test_detect_curl
- PRIVATE
- monetdb_config_header)
-add_test(testDetectCurl test_detect_curl)
-
-add_executable(test_detect_libz test_detect_libz.c)
-target_link_libraries(test_detect_libz
- PRIVATE
- monetdb_config_header)
-add_test(testDetectLibz test_detect_libz)
-
-add_executable(test_detect_lz4 test_detect_lz4.c)
-target_link_libraries(test_detect_lz4
- PRIVATE
- monetdb_config_header)
-add_test(testDetectLz4 test_detect_lz4)
-
-add_executable(test_detect_proj test_detect_proj.c)
-target_link_libraries(test_detect_proj
- PRIVATE
- monetdb_config_header)
-add_test(testDetectProj test_detect_proj)
-
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-iconv.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pthreadh.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pcre.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-openssl.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-commoncrypto.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-bz2.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-curl.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-lzma.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-xml.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-libz.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-lz4.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-proj.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-netcdf.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/detect-lzma.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-readline.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-unixgetaddrinfo.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-wingetaddrinfo.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-getaddrinfo.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pthreadh.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pthreadinit.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pthreadkill.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pthreadsig.cmake)
diff --git a/ctest/cmake/detect-bz2.cmake b/ctest/cmake/detect-bz2.cmake
new file mode 100644
--- /dev/null
+++ b/ctest/cmake/detect-bz2.cmake
@@ -0,0 +1,60 @@
+#[[
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
+#]]
+
+if (${LINUX_DISTRO} STREQUAL "debian")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "9")
+ set(DETECT "0")
+ set(UNDETECT "1")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "10")
+ set(DETECT "0")
+ set(UNDETECT "1")
+ endif()
+elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "18")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "19")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+elseif(${LINUX_DISTRO} STREQUAL "fedora")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "30")
+ set(DETECT "0")
+ set(UNDETECT "1")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "31")
+ set(DETECT "0")
+ set(UNDETECT "1")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ set(DETECT "0")
+ set(UNDETECT "1")
+ endif()
+else()
+ message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
+ message(ERROR "Linux distro version: ${LINUX_DISTRO_VERSION} not known")
+endif()
+
+configure_file(test_detect_bz2.c.in
+ ${CMAKE_CURRENT_BINARY_DIR}/test_detect_bz2.c
+ @ONLY)
+
+add_executable(test_detect_bz2)
+target_sources(test_detect_bz2
+ PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}/test_detect_bz2.c)
+target_link_libraries(test_detect_bz2
+ PRIVATE
+ monetdb_config_header)
+add_test(testDetectBz2 test_detect_bz2)
diff --git a/ctest/cmake/detect-commoncrypto.cmake
b/ctest/cmake/detect-commoncrypto.cmake
new file mode 100644
--- /dev/null
+++ b/ctest/cmake/detect-commoncrypto.cmake
@@ -0,0 +1,60 @@
+#[[
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
+#]]
+
+if (${LINUX_DISTRO} STREQUAL "debian")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "9")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "10")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "18")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "19")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+elseif(${LINUX_DISTRO} STREQUAL "fedora")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "30")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "31")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+else()
+ message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
+ message(ERROR "Linux distro version: ${LINUX_DISTRO_VERSION} not known")
+endif()
+
+configure_file(test_detect_commoncrypto.c.in
+ ${CMAKE_CURRENT_BINARY_DIR}/test_detect_commoncrypto.c
+ @ONLY)
+
+add_executable(test_detect_commoncrypto)
+target_sources(test_detect_commoncrypto
+ PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}/test_detect_commoncrypto.c)
+target_link_libraries(test_detect_commoncrypto
+ PRIVATE
+ monetdb_config_header)
+add_test(testDetectCommoncrypto test_detect_commoncrypto)
diff --git a/ctest/cmake/detect-curl.cmake b/ctest/cmake/detect-curl.cmake
new file mode 100644
--- /dev/null
+++ b/ctest/cmake/detect-curl.cmake
@@ -0,0 +1,60 @@
+#[[
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
+#]]
+
+if (${LINUX_DISTRO} STREQUAL "debian")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "9")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "10")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "18")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "19")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+elseif(${LINUX_DISTRO} STREQUAL "fedora")
+ if(${LINUX_DISTRO_VERSION} STREQUAL "30")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "31")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+ if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ set(DETECT "1")
+ set(UNDETECT "0")
+ endif()
+else()
+ message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
+ message(ERROR "Linux distro version: ${LINUX_DISTRO_VERSION} not known")
+endif()
+
+configure_file(test_detect_curl.c.in
+ ${CMAKE_CURRENT_BINARY_DIR}/test_detect_curl.c
+ @ONLY)
+
+add_executable(test_detect_curl)
+target_sources(test_detect_curl
+ PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}/test_detect_curl.c)
+target_link_libraries(test_detect_curl
+ PRIVATE
+ monetdb_config_header)
+add_test(testDetectCurl test_detect_curl)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
