Split stress-map-insdelfind test to HP and RCU part

[libcds.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66d71b5c60056516d4cb4a853509d750810de1ca..159be5579d55624ec9ba7b0303fcafcc63b86915 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,16 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 cmake_policy(SET CMP0016 NEW)
-cmake_policy(SET CMP0042 NEW)
+if(POLICY CMP0042)
+    cmake_policy(SET CMP0042 NEW)
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build/cmake ${CMAKE_MODULE_PATH})
 include(TargetArch)
 
 project(cds)
 
-set(PROJECT_VERSION 2.2.0)
+set(PROJECT_VERSION 2.3.0)
 
 # Options
 option(WITH_TESTS "Build unit tests" OFF)
@@ -16,12 +18,9 @@ option(WITH_TESTS_COVERAGE "Analyze test coverage using gcov (only for gcc)" OFF
 option(WITH_BOOST_ATOMIC "Use boost atomics (only for boost >= 1.54)" OFF)
 option(WITH_ASAN "Build AddressSantinizer instrumented code" OFF)
 option(WITH_TSAN "Build ThreadSantinizer instrumented code" OFF)
+set(CMAKE_TARGET_ARCHITECTURE "" CACHE string "Target build architecture")
 
-if(CMAKE_CROSSCOMPILING)
-    find_package(Threads)
-else()
-    find_package(Threads REQUIRED)
-endif()
+find_package(Threads)
 
 if(TARGET boost::system AND TARGET boost::thread)
     link_libraries(boost::system boost::thread)
@@ -31,7 +30,9 @@ endif()
 
 include_directories(${Boost_INCLUDE_DIRS})
 
-target_architecture(CMAKE_TARGET_ARCHITECTURE)
+if(NOT CMAKE_TARGET_ARCHITECTURE)
+    target_architecture(CMAKE_TARGET_ARCHITECTURE)
+endif()
 
 if(WITH_BOOST_ATOMIC)
     if(Boost_FOUND)
@@ -131,16 +132,16 @@ include_directories(${PROJECT_SOURCE_DIR})
 set(LIBRARIES_COMPONENT lib)
 set(HEADERS_COMPONENT devel)
 
-set(SOURCES src/hp_gc.cpp
-        src/init.cpp
-        src/dhp_gc.cpp
-        src/urcu_gp.cpp
-        src/urcu_sh.cpp
-        src/michael_heap.cpp
-        src/topology_hpux.cpp
-        src/topology_linux.cpp
-        src/topology_osx.cpp
-        src/dllmain.cpp)
+set(SOURCES src/init.cpp
+            src/hp.cpp
+            src/dhp.cpp
+            src/urcu_gp.cpp
+            src/urcu_sh.cpp
+            src/thread_data.cpp
+            src/topology_hpux.cpp
+            src/topology_linux.cpp
+            src/topology_osx.cpp
+            src/dllmain.cpp)
 
 add_library(${CDS_SHARED_LIBRARY} SHARED ${SOURCES})
 set_target_properties(${CDS_SHARED_LIBRARY} PROPERTIES VERSION ${PROJECT_VERSION}