Skip to content

Commit

Permalink
Use target_compile_options instead of modifying CMAKE_CXX_FLAGS.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tessil committed Jul 16, 2017
1 parent b7ae9e6 commit 74b4135
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
cmake_minimum_required(VERSION 2.8.11)
cmake_minimum_required(VERSION 2.8.12)
project(test_hopscotch_map)
enable_testing()

find_package(Boost 1.54.0 REQUIRED COMPONENTS unit_test_framework)

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wextra -Wold-style-cast -g --coverage -DTSL_DEBUG")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wextra -Wold-style-cast -O3 -DTSL_DEBUG")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX /W3 /DTSL_DEBUG")
endif()


set(TEST_EXECUTABLE "test_hopscotch_map")



add_executable("${TEST_EXECUTABLE}" "tests/main.cpp" "tests/hopscotch_map_tests.cpp" "tests/hopscotch_set_tests.cpp")
target_include_directories("${TEST_EXECUTABLE}" PRIVATE "${Boost_INCLUDE_DIRS}" "src")
target_link_libraries("${TEST_EXECUTABLE}" ${Boost_LIBRARIES})

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
# target_compile_options("${TEST_EXECUTABLE}" PRIVATE -std=c++11 -Werror -Wall -Wextra -Wold-style-cast -g --coverage -DTSL_DEBUG)
target_compile_options("${TEST_EXECUTABLE}" PRIVATE -std=c++11 -Werror -Wall -Wextra -Wold-style-cast -O3 -DTSL_DEBUG)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
target_compile_options("${TEST_EXECUTABLE}" PRIVATE /WX /W3 /DTSL_DEBUG)
endif()

add_test(NAME "all_tests" COMMAND "${TEST_EXECUTABLE}")

0 comments on commit 74b4135

Please sign in to comment.