diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-02-12 10:56:10 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-02-12 10:56:10 +0000 |
commit | c09917c6a75c720438d723f31f7b27940f4fa0bc (patch) | |
tree | c9b6d8d542a3e9715ff042493ca8ca70b41c468e /CMakeLists.txt | |
parent | 721358208b6650c62aa654be922867f10a5d6f38 (diff) |
Optionally use newer cmake features.
So we can keep supporting cmake 2.8.12, which is the version on ubuntu
trusty.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e6d9e2a2..8bba3519 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -14,8 +14,8 @@ | |||
14 | # | 14 | # |
15 | ################################################################################ | 15 | ################################################################################ |
16 | 16 | ||
17 | cmake_minimum_required(VERSION 3.1.0) | 17 | cmake_minimum_required(VERSION 2.8.12) |
18 | cmake_policy(VERSION 3.1.0) | 18 | cmake_policy(VERSION 2.8.12) |
19 | project(toxcore) | 19 | project(toxcore) |
20 | 20 | ||
21 | set(CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake) | 21 | set(CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake) |
@@ -66,14 +66,19 @@ enable_testing() | |||
66 | 66 | ||
67 | set(CMAKE_MACOSX_RPATH ON) | 67 | set(CMAKE_MACOSX_RPATH ON) |
68 | 68 | ||
69 | # Set standard version for compiler. | 69 | if(${CMAKE_VERSION} VERSION_LESS "3.1.0") |
70 | set(CMAKE_C_STANDARD 99) | 70 | add_cflag("-std=c99") |
71 | set(CMAKE_CXX_STANDARD 11) | 71 | add_cxxflag("-std=c++11") |
72 | set(CMAKE_C_EXTENSIONS OFF) | 72 | else() |
73 | set(CMAKE_CXX_EXTENSIONS OFF) | 73 | # Set standard version for compiler. |
74 | 74 | set(CMAKE_C_STANDARD 99) | |
75 | message(STATUS "Supported C compiler features = ${CMAKE_C_COMPILE_FEATURES}") | 75 | set(CMAKE_CXX_STANDARD 11) |
76 | message(STATUS "Supported C++ compiler features = ${CMAKE_CXX_COMPILE_FEATURES}") | 76 | set(CMAKE_C_EXTENSIONS OFF) |
77 | set(CMAKE_CXX_EXTENSIONS OFF) | ||
78 | |||
79 | message(STATUS "Supported C compiler features = ${CMAKE_C_COMPILE_FEATURES}") | ||
80 | message(STATUS "Supported C++ compiler features = ${CMAKE_CXX_COMPILE_FEATURES}") | ||
81 | endif() | ||
77 | 82 | ||
78 | if(NOT MSVC) | 83 | if(NOT MSVC) |
79 | # Warn on non-ISO C. | 84 | # Warn on non-ISO C. |