diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2020-12-01 13:05:06 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2020-12-01 14:50:01 (GMT) |
| commit | f8d8faff8d01323d5a48a3b9be55cf9b6e10d5b4 (patch) | |
| tree | 748c7eab8a29147749ccbf11f367dd0670b01136 /Modules/Platform/Windows-Intel.cmake | |
| parent | a22a8f1e36628f32485b4aebed7cd30ee40c5b4a (diff) | |
| download | CMake-f8d8faff8d01323d5a48a3b9be55cf9b6e10d5b4.zip CMake-f8d8faff8d01323d5a48a3b9be55cf9b6e10d5b4.tar.gz CMake-f8d8faff8d01323d5a48a3b9be55cf9b6e10d5b4.tar.bz2 | |
Ninja Generators: Homogenize configuration with Makefiles
* Use same configuration variables to configure dependencies
* Abstract Ninja deps format from compiler one
Diffstat (limited to 'Modules/Platform/Windows-Intel.cmake')
| -rw-r--r-- | Modules/Platform/Windows-Intel.cmake | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake index 5d8f7fc..01f8dd0 100644 --- a/Modules/Platform/Windows-Intel.cmake +++ b/Modules/Platform/Windows-Intel.cmake @@ -8,6 +8,20 @@ if(__WINDOWS_INTEL) endif() set(__WINDOWS_INTEL 1) + +if (CMAKE_GENERATOR MATCHES "^Ninja") + # retrieve ninja version to enable dependencies configuration + # against Ninja capabilities + execute_process(COMMAND "${CMAKE_MAKE_PROGRAM}" --version + RESULT_VARIABLE _CMAKE_NINJA_RESULT + OUTPUT_VARIABLE _CMAKE_NINJA_VERSION + ERROR_VARIABLE _CMAKE_NINJA_VERSION) + if (NOT _CMAKE_NINJA_RESULT AND _CMAKE_NINJA_VERSION MATCHES "[0-9]+(\\.[0-9]+)*") + set (_CMAKE_NINJA_VERSION "${CMAKE_MATCH_0}") + endif() + unset(_CMAKE_NINJA_RESULT) +endif() + include(Platform/Windows-MSVC) macro(__windows_compiler_intel lang) __windows_compiler_msvc(${lang}) |