diff options
| author | Dennis Brentjes <d.brentjes@gmail.com> | 2016-12-15 12:38:51 +0100 |
|---|---|---|
| committer | Dennis Brentjes <d.brentjes@gmail.com> | 2016-12-15 12:38:51 +0100 |
| commit | 0700ae054385610eef21ba673413811b1d9e4b64 (patch) | |
| tree | 46611ba3d3c84576e053c7ff3da7fd9c72b128d0 /CMakeLists.txt | |
| parent | b42cb376c32ef4182d3e7f405f50dde2641e85b0 (diff) | |
| download | cmix-0700ae054385610eef21ba673413811b1d9e4b64.tar.gz cmix-0700ae054385610eef21ba673413811b1d9e4b64.tar.bz2 cmix-0700ae054385610eef21ba673413811b1d9e4b64.zip | |
Debugged CMake files which caused compiler flags to be truncated
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bfad59e..5855117 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 3.6.1) project(cmix) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +if(WIN32) + set(CMAKE_CXX_EXTENSIONS ON) +else(WIN32) + set(CMAKE_CXX_EXTENSIONS OFF) +endif(WIN32) + +set(CMAKE_C_STANDARD 99) +set(CMAKE_C_STANDARD_REQUIRED ON) +set(CMAKE_C_EXTENSIONS OFF) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules ${CMAKE_CURRENT_SOURCE_DIR}/wubwubcmake) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules) @@ -43,13 +55,6 @@ if(use_lto) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto") endif(use_lto) -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) -set(CMAKE_C_STANDARD 99) -set(CMAKE_C_STANDARD_REQUIRED ON) -set(CMAKE_C_EXTENSIONS OFF) - add_subdirectory(libcmix-crypto) add_subdirectory(libcmix) |
