Skip to content

Commit 50d44d2

Browse files
committed
CMakeLists.txt: require C++11 and C99; bump CMake min to 3.0
The bump to CMake 3.0 is just to acknowledge the fact that Python mapscript in master requires a GENERATE command that requires 3.0 at least.
1 parent 3bfbc6c commit 50d44d2

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

Diff for: CMakeLists.txt

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 2.6)
1+
cmake_minimum_required (VERSION 3.0)
22

33
project (MapServer)
44

@@ -20,6 +20,24 @@ set (MapServer_VERSION_MINOR 5)
2020
set (MapServer_VERSION_REVISION 0)
2121
set (MapServer_VERSION_SUFFIX "")
2222

23+
# Set C++ version
24+
# Make CMAKE_CXX_STANDARD available as cache option overridable by user
25+
set(CMAKE_CXX_STANDARD 11
26+
CACHE STRING "C++ standard version to use (default is 11)")
27+
message(STATUS "Requiring C++${CMAKE_CXX_STANDARD}")
28+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
29+
set(CMAKE_CXX_EXTENSIONS OFF)
30+
message(STATUS "Requiring C++${CMAKE_CXX_STANDARD} - done")
31+
32+
# Set C99 version
33+
# Make CMAKE_C_STANDARD available as cache option overridable by user
34+
set(CMAKE_C_STANDARD 99
35+
CACHE STRING "C standard version to use (default is 99)")
36+
message(STATUS "Requiring C${CMAKE_C_STANDARD}")
37+
set(CMAKE_C_STANDARD_REQUIRED ON)
38+
set(CMAKE_C_EXTENSIONS OFF)
39+
message(STATUS "Requiring C${CMAKE_C_STANDARD} - done")
40+
2341
set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
2442
set(TARGET_VERSION_MINOR ${MapServer_VERSION_MINOR})
2543

0 commit comments

Comments
 (0)