X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=CMakeLists.txt;h=0d9d61b11984b173f3f51f53660d2f0abded0cef;hp=320d486e90dd90bd499388e06dceef0eeefb9115;hb=eb9f6566c16b481e1ac6bb516097fc0bdc2a55c6;hpb=73423ec8a293b5080677a2d725891a1fb68ef0ac diff --git a/CMakeLists.txt b/CMakeLists.txt index 320d486e..0d9d61b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,14 @@ cmake_policy(SET CMP0016 NEW) project(cds) -set(PROJECT_VERSION 2.1.0) +set(PROJECT_VERSION 2.2.0) # Options option(WITH_TESTS "Build unit tests" OFF) 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) find_package(Threads REQUIRED) find_package(Boost 1.50 COMPONENTS system thread REQUIRED) @@ -22,6 +24,26 @@ if(WITH_BOOST_ATOMIC) endif() endif(WITH_BOOST_ATOMIC) +if(WITH_ASAN) + if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fPIC -fsanitize=address -g -fno-omit-frame-pointer -fno-optimize-sibling-calls") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O1 -fsanitize=address -g -fno-omit-frame-pointer -fno-optimize-sibling-calls") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address -pie") + else() + message(WARNING "Compiler does not support AddressSanitizer") + endif() +endif(WITH_ASAN) + +if(WITH_TSAN) + if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fPIC -fsanitize=thread -g -DCDS_THREAD_SANITIZER_ENABLED -fno-omit-frame-pointer") + set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fPIC -fsanitize=thread -g -DCDS_THREAD_SANITIZER_ENABLED -fno-omit-frame-pointer") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread -pie") + else() + message(WARNING "Compiler does not support ThreadSanitizer") + endif() +endif(WITH_TSAN) + if(WITH_TESTS_COVERAGE) if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") @@ -39,23 +61,37 @@ set(CDS_STATIC_LIBRARY ${PROJECT_NAME}-s) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) -set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) +if(CDS_BIN_DIR) + set(EXECUTABLE_OUTPUT_PATH ${CDS_BIN_DIR}) + set(LIBRARY_OUTPUT_PATH ${CDS_BIN_DIR}) +else() + set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) + set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) +endif() +message(STATUS "Binary output path: ${EXECUTABLE_OUTPUT_PATH}") if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug CACHE STRING "Default build type to Debug" FORCE) endif() -message("Build type -- ${CMAKE_BUILD_TYPE}") - if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -pedantic -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -fno-strict-aliasing") +# gcc 4.8: disable noise -Wunused-local-typedefs + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -Wno-unused-parameter") endif() set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") -include_directories(${CMAKE_SOURCE_DIR}) +message("Build type -- ${CMAKE_BUILD_TYPE}") +message("Compiler version: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") +if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") + message("Compiler flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") +else() + message("Compiler flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") +endif() + +include_directories(${PROJECT_SOURCE_DIR}) # Component names for separate distribution in rpms, debs etc. set(LIBRARIES_COMPONENT lib) @@ -73,17 +109,20 @@ set(SOURCES src/hp_gc.cpp src/dllmain.cpp) add_library(${CDS_SHARED_LIBRARY} SHARED ${SOURCES}) +set_target_properties( ${CDS_SHARED_LIBRARY} PROPERTIES VERSION ${PROJECT_VERSION} + DEBUG_POSTFIX "_d") add_library(${CDS_STATIC_LIBRARY} STATIC ${SOURCES}) -target_link_libraries(${CDS_SHARED_LIBRARY} PRIVATE ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -target_link_libraries(${CDS_STATIC_LIBRARY} PRIVATE ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +set_target_properties(${CDS_STATIC_LIBRARY} PROPERTIES DEBUG_POSTFIX "_d") +target_link_libraries(${CDS_SHARED_LIBRARY} PRIVATE ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(${CDS_STATIC_LIBRARY} PRIVATE ${CMAKE_THREAD_LIBS_INIT}) install(TARGETS ${CDS_SHARED_LIBRARY} DESTINATION lib COMPONENT ${LIBRARIES_COMPONENT}) install(TARGETS ${CDS_STATIC_LIBRARY} DESTINATION lib COMPONENT ${LIBRARIES_COMPONENT}) -install(DIRECTORY ${CMAKE_SOURCE_DIR}/cds DESTINATION include COMPONENT ${HEADERS_COMPONENT}) +install(DIRECTORY ${PROJECT_SOURCE_DIR}/cds DESTINATION include COMPONENT ${HEADERS_COMPONENT}) if(WITH_TESTS) enable_testing() - add_subdirectory(${CMAKE_SOURCE_DIR}/tests) + add_subdirectory(${PROJECT_SOURCE_DIR}/test) message(STATUS "Build tests: activated") endif(WITH_TESTS) @@ -93,7 +132,7 @@ set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) set(CPACK_PACKAGE_CONTACT "Max Khizhinsky ") set(CPACK_PACKAGE_RELEASE 1) set(CPACK_PACKAGE_INSTALL_DIRECTORY "cds") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/build/cmake/description.txt") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/build/cmake/description.txt") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Library of concurrent data structures") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}") set(DEPLOY_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}") @@ -104,8 +143,8 @@ set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) # RPM specific set(CPACK_RPM_COMPONENT_INSTALL ON) set(CPACK_RPM_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE}) -set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/build/cmake/post_install_script.sh") -set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/build/cmake/post_uninstall_script.sh") +set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/build/cmake/post_install_script.sh") +set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/build/cmake/post_uninstall_script.sh") set(CPACK_RPM_PACKAGE_URL https://github.com/khizmax/libcds) set(CPACK_RPM_PACKAGE_LICENSE GPL) set(CPACK_RPM_PACKAGE_GROUP "System Environment/Base") @@ -118,7 +157,7 @@ set(CPACK_RPM_devel_PACKAGE_REQUIRES "boost >= 1.50, cds-lib = ${PROJECT_VERSION set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_DEBIAN_PACKAGE_DEPENDS "boost (>= 1.50)") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/khizmax/libcds") -set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/build/cmake/post_install_script.sh;;${CMAKE_SOURCE_DIR}/build/cmake/post_uninstall_script.sh;" ) +set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_SOURCE_DIR}/build/cmake/post_install_script.sh;;${PROJECT_SOURCE_DIR}/build/cmake/post_uninstall_script.sh;" ) # NSYS specific set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") @@ -136,4 +175,4 @@ set(CPACK_COMPONENT_${HEADERS_COMPONENT}_DEPENDS ${LIBRARIES_COMPONENT}) set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "All of the tools you'll ever need to develop lock-free oriented software with libcds") set(CPACK_COMPONENT_GROUP_RUNTIME_DESCRIPTION "Only libcds library for runtime") -include(CPack) \ No newline at end of file +include(CPack)