File tree 3 files changed +9
-3
lines changed
3 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ matrix:
26
26
- export PATH=/tmp/b2/bin:${PATH}
27
27
- cd /tmp/boost && b2 toolset=gcc cxxflags="-std=c++14 ${CXXFLAGS}"
28
28
- os: osx
29
- osx_image: xcode9.2
29
+ osx_image: xcode9.4
30
30
env:
31
31
before_install:
32
32
- brew upgrade boost cmake
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ set (Cadmium_VERSION_PATCH 3)
7
7
8
8
include(CheckCXXCompilerFlag)
9
9
10
+ set(Boost_USE_MULTITHREADED OFF)
10
11
find_package(Boost COMPONENTS unit_test_framework REQUIRED)
11
12
12
13
add_library(Cadmium INTERFACE)
@@ -16,18 +17,23 @@ include_directories(include ${Boost_INCLUDE_DIRS})
16
17
# Check for standard to use
17
18
check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17)
18
19
if(HAVE_FLAG_STD_CXX17)
20
+ message(STATUS "Using C++17 flag")
19
21
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic --std=c++17")
20
22
else()
23
+ message(STATUS "Using C++1z flag")
21
24
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic --std=c++1z")
22
25
endif()
23
26
27
+
28
+ #link_libraries(${Boost_EXCEPTION})
29
+
24
30
enable_testing()
25
31
# Unit tests
26
32
FILE(GLOB TestSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/*_test.cpp)
27
33
foreach(testSrc ${TestSources})
28
34
get_filename_component(testName ${testSrc} NAME_WE)
29
35
add_executable(${testName} test/main-test.cpp ${testSrc})
30
- target_link_libraries(${testName} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
36
+ target_link_libraries(${testName} PUBLIC ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
31
37
add_test(${testName} ${testName})
32
38
endforeach(testSrc)
33
39
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ project cadmium
11
11
<include>$(BOOST_ROOT)
12
12
<include>include
13
13
<cxxflags>-pedantic
14
- <cxxflags>-std=c++1z
14
+ <cxxflags>-std=c++17
15
15
: build-dir ./build
16
16
;
17
17
You can’t perform that action at this time.
0 commit comments