projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactors queue push pop
[libcds.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 435507710fb1780276eb6134b5aa325e2f942375..f8fe196448c3fb93152e2b7aa418a65d0248b712 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,5
+1,10
@@
cmake_minimum_required(VERSION 2.8.12)
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)
cmake_policy(SET CMP0016 NEW)
if(POLICY CMP0042)
cmake_policy(SET CMP0042 NEW)
@@
-10,7
+15,7
@@
include(TargetArch)
project(cds)
project(cds)
-set(PROJECT_VERSION 2.
3
.0)
+set(PROJECT_VERSION 2.
4
.0)
# Options
option(WITH_TESTS "Build unit tests" OFF)
# 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()
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")
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()
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()
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})
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)
if(WITH_TESTS)
enable_testing()
add_subdirectory(${PROJECT_SOURCE_DIR}/test)