Changeset: 9d0b76e61cf3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d0b76e61cf3
Added Files:
cmake/Modules/FindLidar.cmake
cmake/Modules/FindLzma.cmake
cmake/Toolchains/linux-gnu.cmake
ctest/cmake/detect-lzma.cmake
ctest/cmake/detect-readline.cmake
ctest/cmake/test_detect_readline.c.in
Modified Files:
CMakeLists.txt
cmake/Modules/FindNetCDF.cmake
cmake/monetdb-findpackages.cmake
cmake/monetdb-functions.cmake
ctest/cmake/CMakeLists.txt
Branch: mbedded
Log Message:
next round of cmake cleanup
diffs (truncated from 437 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ find_path(HAVE_SYS_TYPES_H "sys/types.h"
find_path(HAVE_SEMAPHORE_H "semaphore.h")
find_path(HAVE_GETOPT_H "getopt.h")
if(HAVE_GETOPT_H)
- set(HAVE_GETOPT 1)
+ set(HAVE_GETOPT 1)
endif()
check_include_file("stdatomic.h" HAVE_STDATOMIC_H)
@@ -185,6 +185,7 @@ set(HAVE_SNAPPY ${SNAPPY_FOUND})
set(HAVE_UUID ${HAVE_UUID_GENERATE})
set(HAVE_VALGRIND ${VALGRIND_FOUND})
set(HAVE_NETCDF ${NETCDF_FOUND})
+set(HAVE_READLINE "${READLINE_FOUND}")
set(SOCKET_LIBRARIES "")
if (WIN32)
diff --git a/cmake/Modules/FindLidar.cmake b/cmake/Modules/FindLidar.cmake
new file mode 100644
--- /dev/null
+++ b/cmake/Modules/FindLidar.cmake
@@ -0,0 +1,17 @@
+ #include(/usr/share/cmake/libLAS/liblas-config.cmake)
+ #include(/usr/share/cmake/libLAS/liblas-config-version.cmake)
+
+ #if(LIBLAS_FOUND)
+ #set(LIBLAS_VERSION_REQUIRED_MIN "1.8.0")
+ #if(LIBLAS_VERSION VERSION_LESS "${LIBLAS_MINIMUM_VERSION}")
+ ##if(${WITH_LIBLAS} STREQUAL "YES")
+ ## message(FATAL_ERROR "liblas library found, but the version is
too old: ${LIBLAS_VERSION} < ${LIBLAS_MINIMUM_VERSION}")
+ ##else()
+ #message(STATUS "liblas library found, but the version is too old:
${LIBLAS_VERSION} < ${LIBLAS_MINIMUM_VERSION}")
+ ##endif()
+ #else()
+ #set(HAVE_LIDAR "${LIBLAS_FOUND}")
+ #endif()
+ ##else()
+ ## message(FATAL_ERROR "liblas library required for lidar module")
+ #endif()
diff --git a/cmake/Modules/FindLzma.cmake b/cmake/Modules/FindLzma.cmake
new file mode 100644
--- /dev/null
+++ b/cmake/Modules/FindLzma.cmake
@@ -0,0 +1,19 @@
+#[[
+# 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.
+#]]
+
+find_package(LibLZMA)
+
+if (LIBLZMA_FOUND)
+ if(NOT TARGET LibLZMA::LibLZMA)
+ add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED)
+ set_target_properties(LibLZMA::LibLZMA PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES ${LIBLZMA_INCLUDE_DIR}
+ IMPORTED_LINK_INTERFACE_LANGUAGES C
+ IMPORTED_LOCATION ${LIBLZMA_LIBRARY})
+ endif()
+endif ()
diff --git a/cmake/Modules/FindNetCDF.cmake b/cmake/Modules/FindNetCDF.cmake
--- a/cmake/Modules/FindNetCDF.cmake
+++ b/cmake/Modules/FindNetCDF.cmake
@@ -33,8 +33,8 @@ if(NETCDF_FOUND)
if(NETCDF_VERSION VERSION_LESS "${NETCDF_MINIMUM_VERSION}")
message(STATUS "netcdf library found, but the version is too old:
${NETCDF_VERSION} < ${NETCDF_MINIMUM_VERSION}")
set(NETCDF_FOUND FALSE)
- endif()
endif()
+endif()
if(NETCDF_FOUND)
add_library(NetCDF::NetCDF UNKNOWN IMPORTED)
diff --git a/cmake/Toolchains/linux-gnu.cmake b/cmake/Toolchains/linux-gnu.cmake
new file mode 100644
--- /dev/null
+++ b/cmake/Toolchains/linux-gnu.cmake
@@ -0,0 +1,35 @@
+#[[
+# 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.
+#]]
+
+ # Our code is not (yet?) up to these:
+ # MT_checkCompilerFlag("-pedantic-errors")
+ # MT_checkCompilerFlag("-Wno-long-long")
+ # MT_checkCompilerFlag("-Waggregate-return")
+ # MT_checkCompilerFlag("-Wbad-function-cast")
+ # MT_checkCompilerFlag("-Wcast-qual")
+ # MT_checkCompilerFlag("-Wconversion")
+ # MT_checkCompilerFlag("-Wdisabled-optimization")
+ # MT_checkCompilerFlag("-Wfloat-equal")
+ # MT_checkCompilerFlag("-Winline")
+ # MT_checkCompilerFlag("-Wmissing-noreturn")
+ # MT_checkCompilerFlag("-Wpadded")
+ # MT_checkCompilerFlag("-Wredundant-decls")
+ # MT_checkCompilerFlag("-Wshadow")
+ # MT_checkCompilerFlag("-Wstrict-prototypes")
+ # MT_checkCompilerFlag("-Wswitch-default")
+ # MT_checkCompilerFlag("-Wswitch-enum")
+ # MT_checkCompilerFlag("-Wtraditional")
+ # MT_checkCompilerFlag("-Wtraditional-conversion")
+ # MT_checkCompilerFlag("-Wwrite-strings")
+ # MT_checkCompilerFlag("-Wc++-compat")
+ # MT_checkCompilerFlag("-Woverlength-strings")
+ # MT_checkCompilerFlag("-Wsign-conversion")
+ # MT_checkCompilerFlag("-Wstrict-overflow=5")
+ # MT_checkCompilerFlag("-Wvla")
+ # MT_checkCompilerFlag("-Wunsuffixed-float-constants")
+ # MT_checkCompilerFlag("-Wnull-dereference")
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -32,17 +32,7 @@ if(WIN32)
endif()
if(WITH_LZMA)
- find_package(LibLZMA)
-
- if (LIBLZMA_FOUND)
- if(NOT TARGET LibLZMA::LibLZMA)
- add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED)
- set_target_properties(LibLZMA::LibLZMA PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES
${LIBLZMA_INCLUDE_DIR}
- IMPORTED_LINK_INTERFACE_LANGUAGES C
- IMPORTED_LOCATION ${LIBLZMA_LIBRARY})
- endif()
- endif ()
+ find_package(Lzma)
endif()
if(WITH_XML2)
@@ -98,7 +88,6 @@ endif()
if(WITH_READLINE)
find_package(Readline)
- set(HAVE_READLINE "${READLINE_FOUND}")
endif()
if(FITS)
@@ -128,23 +117,7 @@ if(SHP)
endif()
if(LIDAR)
- #include(/usr/share/cmake/libLAS/liblas-config.cmake)
- #include(/usr/share/cmake/libLAS/liblas-config-version.cmake)
-
- #if(LIBLAS_FOUND)
- #set(LIBLAS_VERSION_REQUIRED_MIN "1.8.0")
- #if(LIBLAS_VERSION VERSION_LESS "${LIBLAS_MINIMUM_VERSION}")
- ##if(${WITH_LIBLAS} STREQUAL "YES")
- ## message(FATAL_ERROR "liblas library found, but the version is
too old: ${LIBLAS_VERSION} < ${LIBLAS_MINIMUM_VERSION}")
- ##else()
- #message(STATUS "liblas library found, but the version is too old:
${LIBLAS_VERSION} < ${LIBLAS_MINIMUM_VERSION}")
- ##endif()
- #else()
- #set(HAVE_LIDAR "${LIBLAS_FOUND}")
- #endif()
- ##else()
- ## message(FATAL_ERROR "liblas library required for lidar module")
- #endif()
+ find_package(Lidar)
endif()
if(ODBC)
@@ -247,33 +220,6 @@ if(STRICT)
MT_checkCompilerFlag("-Wunreachable-code")
- # Our code is not (yet?) up to these:
- # MT_checkCompilerFlag("-pedantic-errors")
- # MT_checkCompilerFlag("-Wno-long-long")
- # MT_checkCompilerFlag("-Waggregate-return")
- # MT_checkCompilerFlag("-Wbad-function-cast")
- # MT_checkCompilerFlag("-Wcast-qual")
- # MT_checkCompilerFlag("-Wconversion")
- # MT_checkCompilerFlag("-Wdisabled-optimization")
- # MT_checkCompilerFlag("-Wfloat-equal")
- # MT_checkCompilerFlag("-Winline")
- # MT_checkCompilerFlag("-Wmissing-noreturn")
- # MT_checkCompilerFlag("-Wpadded")
- # MT_checkCompilerFlag("-Wredundant-decls")
- # MT_checkCompilerFlag("-Wshadow")
- # MT_checkCompilerFlag("-Wstrict-prototypes")
- # MT_checkCompilerFlag("-Wswitch-default")
- # MT_checkCompilerFlag("-Wswitch-enum")
- # MT_checkCompilerFlag("-Wtraditional")
- # MT_checkCompilerFlag("-Wtraditional-conversion")
- # MT_checkCompilerFlag("-Wwrite-strings")
- # MT_checkCompilerFlag("-Wc++-compat")
- # MT_checkCompilerFlag("-Woverlength-strings")
- # MT_checkCompilerFlag("-Wsign-conversion")
- # MT_checkCompilerFlag("-Wstrict-overflow=5")
- # MT_checkCompilerFlag("-Wvla")
- # MT_checkCompilerFlag("-Wunsuffixed-float-constants")
- # MT_checkCompilerFlag("-Wnull-dereference")
elseif(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
MT_addCompilerFlag("${COMPILER_OPTION}Wall" "${COMPILER_OPTION}Wall"
"${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
MT_addCompilerFlag("${COMPILER_OPTION}Wcheck" "${COMPILER_OPTION}Wcheck"
"${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -131,5 +131,6 @@ function(monetdb_cmake_summary)
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("-----------------------------------------")
endfunction()
diff --git a/ctest/cmake/CMakeLists.txt b/ctest/cmake/CMakeLists.txt
--- a/ctest/cmake/CMakeLists.txt
+++ b/ctest/cmake/CMakeLists.txt
@@ -16,50 +16,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
get_os_release_info(LINUX_DISTRO LINUX_DISTRO_VERSION)
endif()
-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 "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_lzma.c.in
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_lzma.c
- @ONLY)
-
add_executable(test_detect test_detect.c)
target_link_libraries(test_detect
PRIVATE
@@ -84,15 +40,6 @@ target_link_libraries(test_detect_curl
monetdb_config_header)
add_test(testDetectCurl test_detect_curl)
-add_executable(test_detect_lzma)
-target_sources(test_detect_lzma
- PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_lzma.c)
-target_link_libraries(test_detect_lzma
- PRIVATE
- monetdb_config_header)
-add_test(testDetectLzma test_detect_lzma)
-
add_executable(test_detect_libz test_detect_libz.c)
target_link_libraries(test_detect_libz
PRIVATE
@@ -112,3 +59,5 @@ target_link_libraries(test_detect_proj
add_test(testDetectProj test_detect_proj)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-netcdf.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-lzma.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/detect-readline.cmake)
diff --git a/ctest/cmake/detect-lzma.cmake b/ctest/cmake/detect-lzma.cmake
new file mode 100644
--- /dev/null
+++ b/ctest/cmake/detect-lzma.cmake
@@ -0,0 +1,53 @@
+if (${LINUX_DISTRO} STREQUAL "debian")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
