Skip to content

Commit b9a1f16

Browse files
committed
Modernize CMake config
1 parent 860a7d5 commit b9a1f16

1 file changed

Lines changed: 20 additions & 22 deletions

File tree

CMakeLists.txt

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,29 @@
66
#
77
#-----------------------------------------------------------------------------
88

9-
cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)
9+
cmake_minimum_required(VERSION 3.10)
10+
1011
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
1112

1213

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+
1332
#-----------------------------------------------------------------------------
1433
#
1534
# Configurations
@@ -172,27 +191,6 @@ set(_own_index)
172191
include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
173192

174193

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-
196194
#-----------------------------------------------------------------------------
197195
#
198196
# Compiler and Linker flags

0 commit comments

Comments
 (0)