fix segfault: dtrace build on solaris

[m6w6/libmemcached] / CMakeConfig.txt

diff --git a/CMakeConfig.txt b/CMakeConfig.txt
index 1f23c2a97dc0404468c536ad94c843cf8502e700..4d17185f4f9a7b059d40ec3f0839bdd8426bff46 100644 (file)
--- a/CMakeConfig.txt
+++ b/CMakeConfig.txt
@@ -1,4 +1,3 @@
-
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     if(NOT DEFINED ENV{CMAKE_BUILD_TYPE})
         set(ENV{CMAKE_BUILD_TYPE} Release)
@@ -14,7 +13,7 @@ if(APPLE)
         CACHE STRING "set relative rpath")
 elseif(UNIX)
     # FIXME
-    set(CMAKE_INSTALL_RPATH $ORIGIN
+    set(CMAKE_INSTALL_RPATH "\$ORIGIN"
         CACHE STRING "set relative rpath")
 endif()
 
@@ -31,21 +30,29 @@ option(BUILD_DOCS_MAN       "build manpages"
 option(BUILD_DOCS_MANGZ     "gzip manpages"
         ${BUILD_DOCS_MAN})
 
+set(ENABLE_SANITIZERS "$ENV{ENABLE_SANITIZERS}"
+        CACHE STRING "sanitizers to enable (e.g. address;undefined ...)")
+option(ENABLE_SASL          "enable SASL support"
+        $ENV{ENABLE_SASL})
 option(ENABLE_DTRACE        "enable dtrace support"
         $ENV{ENABLE_DTRACE})
-option(ENABLE_HASH_FNV64    "enable fnv64 hash support"
-        ON)
-option(ENABLE_HASH_MURMUR   "enable murmur hash support"
-        ON)
 option(ENABLE_HASH_HSIEH    "enable hsieh hash support"
         $ENV{ENABLE_HASH_HSIEH})
+if(NOT DEFINED ENV{ENABLE_HASH_FNV64})
+    set(ENV{ENABLE_HASH_FNV64} ON)
+endif()
+option(ENABLE_HASH_FNV64    "enable fnv64 hash support"
+        $ENV{ENABLE_HASH_FNV64})
+if(NOT DEFINED ENV{ENABLE_HASH_MURMUR})
+    set(ENV{ENABLE_HASH_MURMUR} ON)
+endif()
+option(ENABLE_HASH_MURMUR   "enable murmur hash support"
+        $ENV{ENABLE_HASH_MURMUR})
+if(NOT DEFINED ENV{ENABLE_MEMASLAP})
+    set(ENV{ENABLE_MEMASLAP} ON)
+endif()
 option(ENABLE_MEMASLAP      "enable memaslap client"
-        ON)
-option(ENABLE_SASL          "enable SASL support"
-        $ENV{ENABLE_SASL})
-
-set(ENABLE_SANITIZERS "$ENV{ENABLE_SANITIZERS}"
-    CACHE STRING "sanitizers to enable (e.g. address undefined ...)")
+       $ENV{ENABLE_MEMASLAP})
 
 if(BUILD_TESTING)
     set(MEMCACHED_BINARY "$ENV{MEMCACHED_BINARY}"
@@ -53,7 +60,10 @@ if(BUILD_TESTING)
     set(CMAKE_CTEST_ARGUMENTS "--output-on-failure")
     if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
         # available since CMake 3.17
-        list(APPEND CMAKE_CTEST_ARGUMENTS -j2 --repeat until-pass:2)
+        list(APPEND CMAKE_CTEST_ARGUMENTS --repeat until-pass:2)
+        if(NOT "$ENV{CIRRUS_CI}")
+            list(APPEND CMAKE_CTEST_ARGUMENTS -j2)
+        endif()
     endif()
 endif()
 
@@ -73,8 +83,6 @@ endif()
 # legacy
 
 set(HAVE_VISIBILITY 1)
-set(HAVE_SHARED_ENABLED 1)
-set(HAVE_GCC_BUILTIN_ATOMIC 1)
 
 # modules