|
6 | 6 | # |
7 | 7 | #----------------------------------------------------------------------------- |
8 | 8 |
|
9 | | -cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR) |
| 9 | +cmake_minimum_required(VERSION 3.10) |
| 10 | + |
10 | 11 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") |
11 | 12 |
|
12 | 13 |
|
| 14 | +#----------------------------------------------------------------------------- |
| 15 | +# |
| 16 | +# Decide which C++ version to use (Minimum/default: C++14) |
| 17 | +# |
| 18 | +#----------------------------------------------------------------------------- |
| 19 | + |
| 20 | +if(NOT USE_CPP_VERSION) |
| 21 | + set(USE_CPP_VERSION 14) |
| 22 | +endif() |
| 23 | +message(STATUS "Use C++ version: ${USE_CPP_VERSION}") |
| 24 | + |
| 25 | +set(CMAKE_CXX_STANDARD ${USE_CPP_VERSION}) |
| 26 | +set(CMAKE_CXX_EXTENSIONS OFF) |
| 27 | +set(CMAKE_CXX_STANDARD_REQUIRED ON) |
| 28 | + |
| 29 | +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) |
| 30 | + |
| 31 | + |
13 | 32 | #----------------------------------------------------------------------------- |
14 | 33 | # |
15 | 34 | # Configurations |
@@ -172,27 +191,6 @@ set(_own_index) |
172 | 191 | include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS}) |
173 | 192 |
|
174 | 193 |
|
175 | | -#----------------------------------------------------------------------------- |
176 | | -# |
177 | | -# Decide which C++ version to use (Minimum/default: C++14). |
178 | | -# |
179 | | -#----------------------------------------------------------------------------- |
180 | | -if(NOT MSVC) |
181 | | - if(NOT USE_CPP_VERSION) |
182 | | - if(CYGWIN) |
183 | | - set(USE_CPP_VERSION gnu++14) |
184 | | - else() |
185 | | - set(USE_CPP_VERSION c++14) |
186 | | - endif() |
187 | | - endif() |
188 | | - message(STATUS "Use C++ version: ${USE_CPP_VERSION}") |
189 | | - # following only available from cmake 2.8.12: |
190 | | - # add_compile_options(-std=${USE_CPP_VERSION}) |
191 | | - # so using this instead: |
192 | | - add_definitions(-std=${USE_CPP_VERSION}) |
193 | | -endif() |
194 | | - |
195 | | - |
196 | 194 | #----------------------------------------------------------------------------- |
197 | 195 | # |
198 | 196 | # Compiler and Linker flags |
|
0 commit comments