Re-add std=c++14 for travis.

matt-42 · Dec 21, 2016 · 6c5b5b6 · 6c5b5b6
1 parent 875d03f
commit 6c5b5b6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,9 @@ project(Iod)
 
 find_package(Boost REQUIRED) # For lexical_cast
 
+set(CMAKE_CXX_STANDARD 14)
+add_definitions(-std=c++14) # For old cmake versions
+
 install(DIRECTORY iod DESTINATION include
   FILES_MATCHING PATTERN "*.hh")
 install(DIRECTORY iod DESTINATION include

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -4,8 +4,6 @@ enable_testing()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${Boost_INCLUDE_DIRS})
 
-set(CMAKE_CXX_STANDARD 14)
-
 add_definitions(-Wall)
 
 #add_executable(iod_query_stl iod_query_stl.cc)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 project(Iod)
 
-add_definitions(-std=c++14)
+set(CMAKE_CXX_STANDARD 14)
 
 add_executable(iod_generate_symbols iod_generate_symbols.cc)