MonetDB: Oct2020 - detect pthreadkil/sigmask requires pthread li...

[Niels Nes]

Changeset: b37aba2d7636 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b37aba2d7636
Modified Files:
        cmake/monetdb-defines.cmake
        ctest/cmake/detect-pthreadkill.cmake
        ctest/cmake/detect-pthreadsig.cmake
Branch: Oct2020
Log Message:

detect pthreadkil/sigmask requires pthread library


diffs (65 lines):

diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -115,8 +115,11 @@ function(monetdb_configure_defines)
   check_function_exists("uname" HAVE_UNAME)
   # Some libc versions on Linux distributions don't have it
   check_symbol_exists("semtimedop" "sys/types.h;sys/ipc.h;sys/sem.h" 
HAVE_SEMTIMEDOP)
-  check_function_exists("pthread_kill" HAVE_PTHREAD_KILL)
-  check_function_exists("pthread_sigmask" HAVE_PTHREAD_SIGMASK)
+  cmake_push_check_state()
+         set(CMAKE_REQUIRED_LINK_OPTIONS "-lpthread")
+    check_function_exists("pthread_kill" HAVE_PTHREAD_KILL)
+    check_function_exists("pthread_sigmask" HAVE_PTHREAD_SIGMASK)
+  cmake_pop_check_state()
   check_symbol_exists("regcomp" "regex.h" HAVE_POSIX_REGEX)
 endfunction()
 
diff --git a/ctest/cmake/detect-pthreadkill.cmake 
b/ctest/cmake/detect-pthreadkill.cmake
--- a/ctest/cmake/detect-pthreadkill.cmake
+++ b/ctest/cmake/detect-pthreadkill.cmake
@@ -25,17 +25,9 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
     set(UNDETECT "1")
   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")
+  if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
+    set(DETECT "0")
+    set(UNDETECT "1")
   endif()
 else()
   message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
diff --git a/ctest/cmake/detect-pthreadsig.cmake 
b/ctest/cmake/detect-pthreadsig.cmake
--- a/ctest/cmake/detect-pthreadsig.cmake
+++ b/ctest/cmake/detect-pthreadsig.cmake
@@ -25,17 +25,9 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
     set(UNDETECT "1")
   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")
+  if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
+    set(DETECT "0")
+    set(UNDETECT "1")
   endif()
 else()
   message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list