X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=CMakeLists.txt;h=f8fe196448c3fb93152e2b7aa418a65d0248b712;hp=0e62b7abf25741e78007e170ec3c061db47fbcc7;hb=refs%2Fheads%2Fmaster;hpb=c127b1780d72d0fb14460e939d323875432e5244

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e62b7ab..f8fe1964 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,10 @@
 cmake_minimum_required(VERSION 2.8.12)
 
+#SET(CMAKE_C_COMPILER clang-native)
+#SET(CMAKE_CXX_COMPILER clang++-native)
+SET(CMAKE_C_COMPILER clang-cross)
+SET(CMAKE_CXX_COMPILER clang++-cross)
+
 cmake_policy(SET CMP0016 NEW)
 if(POLICY CMP0042)
     cmake_policy(SET CMP0042 NEW)
@@ -10,7 +15,7 @@ include(TargetArch)
 
 project(cds)
 
-set(PROJECT_VERSION 2.3.1)
+set(PROJECT_VERSION 2.4.0)
 
 # Options
 option(WITH_TESTS "Build unit tests" OFF)
@@ -112,7 +117,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         message("C++ std: -std=c++11 (default)")
     endif()
 
-    list(APPEND LIBCDS_PUBLIC_CXX_FLAGS "-fno-strict-aliasing")
     list(APPEND LIBCDS_PRIVATE_CXX_FLAGS "-Wall" "-Wextra" "-pedantic")
 
     if(CMAKE_TARGET_ARCHITECTURE STREQUAL "x86_64")
@@ -152,6 +156,7 @@ else()
     message("Boost: Using CMake-fied boost")
 endif()
 
+
 if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
     set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> -q -c ${CMAKE_STATIC_LINKER_FLAGS} -o <TARGET> <OBJECTS>")
 endif()
@@ -193,6 +198,7 @@ install(TARGETS ${CDS_STATIC_LIBRARY} EXPORT LibCDSConfig DESTINATION lib${LIB_S
 install(EXPORT LibCDSConfig FILE LibCDSConfig.cmake NAMESPACE LibCDS:: DESTINATION lib/cmake/LibCDS)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/cds DESTINATION include COMPONENT ${HEADERS_COMPONENT})
 
+#add_subdirectory(${PROJECT_SOURCE_DIR}/benchmark-drivers)
 if(WITH_TESTS)
     enable_testing()
     add_subdirectory(${PROJECT_SOURCE_DIR}/test)