diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2019-06-06 00:48:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 00:48:55 +0300 |
| commit | a6d6f996019aabaf4f44ff533a39eca01072d017 (patch) | |
| tree | 4751c7f280d8030ef335b4a2ca4ed00f5f2bebb7 /src/coreclr/CMakeLists.txt | |
| parent | 33e536b2fe1ae190c80498b25ccba2b0acba1ef7 (diff) | |
Use Modern CMake features instead of CMAKE_CXX_FLAGS (dotnet/coreclr#24861)
* Convert C++ standard settings and warning options from CMAKE_<LANG>_FLAGS to Modern CMake isms.
* More $<COMPILE_LANGUAGE> generator expressions instead of CMAKE_CXX_FLAGS.
* Use $<COMPILE_LANGUAGE:CXX> for all -fpermissive usage
* Fix generator expression that generates multiple flags
* Fix invalid use of CMAKE_CXX_FLAGS instead of CMAKE_C_FLAGS.
* Treat AppleClang as though it is Clang (match pre-3.0 behavior).
* Update our build system to understand that AppleClang is distinct from Clang and remove CMP0025 policy setting.
* PR Feedback.
Commit migrated from https://github.com/dotnet/coreclr/commit/90dd13ee1bd497d7724c2b1d0fd833d42f7001ad
Diffstat (limited to 'src/coreclr/CMakeLists.txt')
| -rw-r--r-- | src/coreclr/CMakeLists.txt | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index ca5a69b544c..ab5c441785e 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -1,14 +1,7 @@ # Verify minimum required version -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5.1) -if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) - cmake_policy(SET CMP0042 NEW) -endif() - -if (NOT WIN32) - set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -std=c++11" CACHE STRING "Flags used by the compiler during all build types.") - set(CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS_INIT} -std=c11" CACHE STRING "Flags used by the compiler during all build types.") -endif() +cmake_policy(SET CMP0042 NEW) # Set the project name project(CoreCLR) |