Changeset: 786ce2c56c0c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/786ce2c56c0c
Removed Files:
ctest/cmake/detect-getaddrinfo.cmake
ctest/cmake/detect-unixgetaddrinfo.cmake
ctest/cmake/detect-wingetaddrinfo.cmake
ctest/cmake/test_detect_getaddrinfo.c.in
ctest/cmake/test_detect_unixgetaddrinfo.c.in
ctest/cmake/test_detect_wingetaddrinfo.c.in
Modified Files:
cmake/monetdb-defines.cmake
ctest/cmake/CMakeLists.txt
gdk/gdk.h
monetdb_config.h.in
Branch: default
Log Message:
Cleanup: removed unused cmake tests + some layout changes.
diffs (truncated from 543 to 300 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -52,10 +52,6 @@ function(monetdb_configure_defines)
check_symbol_exists("gethostbyname" "netdb.h" HAVE_NETDB_H)
check_symbol_exists("setsockopt" "sys/socket.h" HAVE_SYS_SOCKET_H)
check_symbol_exists("gettimeofday" "sys/time.h" HAVE_SYS_TIME_H)
- # Linux specific, in the future, it might be ported to other platforms
- check_symbol_exists("getaddrinfo" "sys/types.h;sys/socket.h;netdb.h"
UNIX_GETADDRINFO)
- check_symbol_exists("getaddrinfo" "ws2tcpip.h" WIN_GETADDRINFO)
- #check_symbol_exists("WSADATA" "winsock2.h" HAVE_WINSOCK_H)
check_symbol_exists("fdatasync" "unistd.h" HAVE_FDATASYNC)
# Some libc versions on Linux distributions don't have it
check_symbol_exists("accept4"
@@ -83,7 +79,7 @@ function(monetdb_configure_defines)
check_symbol_exists("strerror_s" "string.h" HAVE_STRERROR_S)
check_symbol_exists("strerror_r" "string.h" HAVE_STRERROR_R)
check_function_exists("lockf" HAVE_LOCKF)
- check_symbol_exists("madvise" "sys/mman.h" HAVE_MADVISE)
+# check_symbol_exists("madvise" "sys/mman.h" HAVE_MADVISE)
check_function_exists("malloc_info" HAVE_MALLOC_INFO)
check_function_exists("mallinfo2" HAVE_MALLINFO2)
check_symbol_exists("mremap" "sys/mman.h" HAVE_MREMAP)
@@ -97,7 +93,7 @@ function(monetdb_configure_defines)
check_symbol_exists("posix_fadvise" "fcntl.h" HAVE_POSIX_FADVISE)
# Some POSIX systems don't have it (e.g. Macos)
check_symbol_exists("posix_fallocate" "fcntl.h" HAVE_POSIX_FALLOCATE)
- check_symbol_exists("posix_madvise" "sys/mman.h" HAVE_POSIX_MADVISE)
+# check_symbol_exists("posix_madvise" "sys/mman.h" HAVE_POSIX_MADVISE)
check_function_exists("setsid" HAVE_SETSID)
check_function_exists("sockatmark" HAVE_SOCKATMARK)
check_function_exists("shutdown" HAVE_SHUTDOWN)
@@ -110,7 +106,6 @@ function(monetdb_configure_defines)
check_function_exists("strptime" HAVE_STRPTIME)
check_symbol_exists("sysconf" "unistd.h" HAVE_SYSCONF)
check_function_exists("task_info" HAVE_TASK_INFO)
- check_function_exists("times" HAVE_TIMES)
check_function_exists("uname" HAVE_UNAME)
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
@@ -190,12 +185,6 @@ macro(monetdb_macro_variables)
set(SOCKET_LIBRARIES "ws2_32")
endif()
- if(UNIX_GETADDRINFO)
- set(HAVE_GETADDRINFO 1)
- endif()
- if(WIN_GETADDRINFO)
- set(HAVE_GETADDRINFO 1)
- endif()
# compiler options, profiling (google perf tools), valgrind
# Check that posix regex is available when pcre is not found
# "monetdb5/module/mal/pcre.c" assumes the regex library is available
diff --git a/ctest/cmake/CMakeLists.txt b/ctest/cmake/CMakeLists.txt
--- a/ctest/cmake/CMakeLists.txt
+++ b/ctest/cmake/CMakeLists.txt
@@ -32,9 +32,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/dete
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-valgrind.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-geos.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-gdal.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-pthreadinit.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pthreadkill.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pthreadsig.cmake)
diff --git a/ctest/cmake/detect-getaddrinfo.cmake
b/ctest/cmake/detect-getaddrinfo.cmake
deleted file mode 100644
--- a/ctest/cmake/detect-getaddrinfo.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-#[[
-# SPDX-License-Identifier: MPL-2.0
-#
-# 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 https://mozilla.org/MPL/2.0/.
-#
-# For copyright information, see the file debian/copyright.
-#]]
-
-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 "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} VERSION_GREATER_EQUAL "18")
- set(DETECT "0")
- set(UNDETECT "1")
- endif()
-elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
- 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_getaddrinfo.c.in
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_getaddrinfo.c
- @ONLY)
-
-add_executable(test_detect_getaddrinfo)
-target_sources(test_detect_getaddrinfo
- PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_getaddrinfo.c)
-target_link_libraries(test_detect_getaddrinfo
- PRIVATE
- monetdb_config_header)
-add_test(NAME testDetectGetaddrinfo COMMAND test_detect_getaddrinfo)
diff --git a/ctest/cmake/detect-unixgetaddrinfo.cmake
b/ctest/cmake/detect-unixgetaddrinfo.cmake
deleted file mode 100644
--- a/ctest/cmake/detect-unixgetaddrinfo.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-#[[
-# SPDX-License-Identifier: MPL-2.0
-#
-# 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 https://mozilla.org/MPL/2.0/.
-#
-# For copyright information, see the file debian/copyright.
-#]]
-
-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 "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} VERSION_GREATER_EQUAL "18")
- set(DETECT "0")
- set(UNDETECT "1")
- endif()
-elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
- 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_unixgetaddrinfo.c.in
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_unixgetaddrinfo.c
- @ONLY)
-
-add_executable(test_detect_unixgetaddrinfo)
-target_sources(test_detect_unixgetaddrinfo
- PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_unixgetaddrinfo.c)
-add_test(NAME testDetectUnixgetaddrinfo COMMAND test_detect_unixgetaddrinfo)
diff --git a/ctest/cmake/detect-wingetaddrinfo.cmake
b/ctest/cmake/detect-wingetaddrinfo.cmake
deleted file mode 100644
--- a/ctest/cmake/detect-wingetaddrinfo.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-#[[
-# SPDX-License-Identifier: MPL-2.0
-#
-# 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 https://mozilla.org/MPL/2.0/.
-#
-# For copyright information, see the file debian/copyright.
-#]]
-
-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} VERSION_GREATER_EQUAL "18")
- set(DETECT "1")
- set(UNDETECT "0")
- endif()
-elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
- 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_wingetaddrinfo.c.in
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_wingetaddrinfo.c
- @ONLY)
-
-add_executable(test_detect_wingetaddrinfo)
-target_sources(test_detect_wingetaddrinfo
- PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/test_detect_wingetaddrinfo.c)
-add_test(NAME testDetectWingetaddrinfo COMMAND test_detect_wingetaddrinfo)
diff --git a/ctest/cmake/test_detect_getaddrinfo.c.in
b/ctest/cmake/test_detect_getaddrinfo.c.in
deleted file mode 100644
--- a/ctest/cmake/test_detect_getaddrinfo.c.in
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: MPL-2.0
- *
- * 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 https://mozilla.org/MPL/2.0/.
- *
- * For copyright information, see the file debian/copyright.
- */
-
-#include "monetdb_config.h"
-
-int
-main(void)
-{
-#ifdef HAVE_GETADDRINFO
- return @DETECT@;
-#else
- return @UNDETECT@;
-#endif
-}
diff --git a/ctest/cmake/test_detect_unixgetaddrinfo.c.in
b/ctest/cmake/test_detect_unixgetaddrinfo.c.in
deleted file mode 100644
--- a/ctest/cmake/test_detect_unixgetaddrinfo.c.in
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: MPL-2.0
- *
- * 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 https://mozilla.org/MPL/2.0/.
- *
- * For copyright information, see the file debian/copyright.
- */
-
-#cmakedefine UNIX_GETADDRINFO
-
-int
-main(void)
-{
-#ifdef UNIX_GETADDRINFO
- return @DETECT@;
-#else
- return @UNDETECT@;
-#endif
-}
diff --git a/ctest/cmake/test_detect_wingetaddrinfo.c.in
b/ctest/cmake/test_detect_wingetaddrinfo.c.in
deleted file mode 100644
--- a/ctest/cmake/test_detect_wingetaddrinfo.c.in
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-License-Identifier: MPL-2.0
- *
- * 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 https://mozilla.org/MPL/2.0/.
- *
- * For copyright information, see the file debian/copyright.
- */
-
-#cmakedefine WIN_GETADDRINFO
-
-int
-main(void)
-{
-#ifdef WIN_GETADDRINFO
- return @DETECT@;
-#else
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
