Changeset: 9d779c50efb3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d779c50efb3
Removed Files:
ctest/cmake/test_detect_bz2.c.in
ctest/cmake/test_detect_commoncrypto.c.in
ctest/cmake/test_detect_gdal.c.in
ctest/cmake/test_detect_geos.c.in
ctest/cmake/test_detect_iconv.c.in
ctest/cmake/test_detect_libpy3.c.in
ctest/cmake/test_detect_libr.c.in
ctest/cmake/test_detect_libz.c.in
ctest/cmake/test_detect_lz4.c.in
ctest/cmake/test_detect_lzma.c.in
ctest/cmake/test_detect_netcdf.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_readline.c.in
ctest/cmake/test_detect_snappy.c.in
ctest/cmake/test_detect_uuid.c.in
ctest/cmake/test_detect_valgrind.c.in
ctest/cmake/test_detect_xml.c.in
Modified Files:
ctest/cmake/detect-bz2.cmake
ctest/cmake/detect-commoncrypto.cmake
ctest/cmake/detect-gdal.cmake
ctest/cmake/detect-geos.cmake
ctest/cmake/detect-iconv.cmake
ctest/cmake/detect-libpy3.cmake
ctest/cmake/detect-libr.cmake
ctest/cmake/detect-libz.cmake
ctest/cmake/detect-lz4.cmake
ctest/cmake/detect-lzma.cmake
ctest/cmake/detect-netcdf.cmake
ctest/cmake/detect-openssl.cmake
ctest/cmake/detect-pcre.cmake
ctest/cmake/detect-proj.cmake
ctest/cmake/detect-readline.cmake
ctest/cmake/detect-snappy.cmake
ctest/cmake/detect-uuid.cmake
ctest/cmake/detect-valgrind.cmake
ctest/cmake/detect-xml.cmake
Branch: default
Log Message:
use function to define tests
diffs (truncated from 2167 to 300 lines):
diff --git a/ctest/cmake/detect-bz2.cmake b/ctest/cmake/detect-bz2.cmake
--- a/ctest/cmake/detect-bz2.cmake
+++ b/ctest/cmake/detect-bz2.cmake
@@ -8,53 +8,56 @@
if (${LINUX_DISTRO} STREQUAL "debian")
if(${LINUX_DISTRO_VERSION} STREQUAL "9")
- set(DETECT "0")
- set(UNDETECT "1")
+ assert_package_detected(
+ detect TRUE
+ legacyvariable HAVE_LIBBZ2
+ variablename BZIP2_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "10")
- set(DETECT "0")
- set(UNDETECT "1")
+ assert_package_detected(
+ detect TRUE
+ legacyvariable HAVE_LIBBZ2
+ variablename BZIP2_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_LIBBZ2
+ variablename BZIP2_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_LIBBZ2
+ variablename BZIP2_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "20")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_LIBBZ2
+ variablename BZIP2_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- set(DETECT "0")
- set(UNDETECT "1")
+ assert_package_detected(
+ detect TRUE
+ legacyvariable HAVE_LIBBZ2
+ variablename BZIP2_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- set(DETECT "0")
- set(UNDETECT "1")
+ assert_package_detected(
+ detect TRUE
+ legacyvariable HAVE_LIBBZ2
+ variablename BZIP2_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "32")
- set(DETECT "0")
- set(UNDETECT "1")
+ assert_package_detected(
+ detect TRUE
+ legacyvariable HAVE_LIBBZ2
+ variablename BZIP2_FOUND)
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
--- a/ctest/cmake/detect-commoncrypto.cmake
+++ b/ctest/cmake/detect-commoncrypto.cmake
@@ -8,53 +8,56 @@
if (${LINUX_DISTRO} STREQUAL "debian")
if(${LINUX_DISTRO_VERSION} STREQUAL "9")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_COMMONCRYPTO
+ variablename COMMONCRYPTO_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "10")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_COMMONCRYPTO
+ variablename COMMONCRYPTO_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_COMMONCRYPTO
+ variablename COMMONCRYPTO_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_COMMONCRYPTO
+ variablename COMMONCRYPTO_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "20")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_COMMONCRYPTO
+ variablename COMMONCRYPTO_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_COMMONCRYPTO
+ variablename COMMONCRYPTO_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_COMMONCRYPTO
+ variablename COMMONCRYPTO_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "32")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_COMMONCRYPTO
+ variablename COMMONCRYPTO_FOUND)
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-gdal.cmake b/ctest/cmake/detect-gdal.cmake
--- a/ctest/cmake/detect-gdal.cmake
+++ b/ctest/cmake/detect-gdal.cmake
@@ -8,53 +8,56 @@
if (${LINUX_DISTRO} STREQUAL "debian")
if(${LINUX_DISTRO_VERSION} STREQUAL "9")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_SHP
+ variablename GDAL_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "10")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_SHP
+ variablename GDAL_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_SHP
+ variablename GDAL_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_SHP
+ variablename GDAL_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "20")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_SHP
+ variablename GDAL_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_SHP
+ variablename GDAL_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_SHP
+ variablename GDAL_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "32")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_SHP
+ variablename GDAL_FOUND)
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_gdal.c.in
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_gdal.c
- @ONLY)
-
-add_executable(test_detect_gdal)
-target_sources(test_detect_gdal
- PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_gdal.c)
-target_link_libraries(test_detect_gdal
- PRIVATE
- monetdb_config_header)
-add_test(testDetectGdal test_detect_gdal)
diff --git a/ctest/cmake/detect-geos.cmake b/ctest/cmake/detect-geos.cmake
--- a/ctest/cmake/detect-geos.cmake
+++ b/ctest/cmake/detect-geos.cmake
@@ -8,53 +8,56 @@
if (${LINUX_DISTRO} STREQUAL "debian")
if(${LINUX_DISTRO_VERSION} STREQUAL "9")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_GEOM
+ variablename GEOS_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "10")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_GEOM
+ variablename GEOS_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- set(DETECT "1")
- set(UNDETECT "0")
+ assert_package_detected(
+ detect FALSE
+ legacyvariable HAVE_GEOM
+ variablename GEOS_FOUND)
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- set(DETECT "1")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
