mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 13:51:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ninja Generators: Homogenize configuration with Makefiles

Browse Source 
* Use same configuration variables to configure dependencies
* Abstract Ninja deps format from compiler one
This commit is contained in:
Marc Chevrier
2020-12-01 14:05:06 +01:00
parent a22a8f1e36
commit f8d8faff8d
6 changed files with 78 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/Platform/Windows-Intel-C.cmake
View File

@@ -1,11 +1,27 @@
include(Platform/Windows-Intel)
__windows_compiler_intel(C)
set(CMAKE_NINJA_DEPTYPE_C intel) # special value handled by CMake
set(CMAKE_DEPFILE_FLAGS_C "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
set(CMAKE_C_DEPFILE_FORMAT gcc)
if(CMAKE_GENERATOR MATCHES "^Ninja")
if(_CMAKE_NINJA_VERSION VERSION_LESS 1.9)
# This ninja version is too old to support the Intel depfile format.
# Fall back to msvc depfile format.
set(CMAKE_DEPFILE_FLAGS_C "/showIncludes")
set(CMAKE_C_DEPFILE_FORMAT msvc)
endif()
endif()
if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
AND CMAKE_GENERATOR MATCHES "Makefiles|WMake")
# dependencies are computed by the compiler itself
set(CMAKE_C_DEPFILE_FORMAT gcc)
set(CMAKE_C_DEPENDS_USE_COMPILER TRUE)
endif()
if("${CMAKE_SOURCE_DIR}${CMAKE_BINARY_DIR}" MATCHES " ")
# The Intel compiler does not properly escape spaces in a depfile.
# Fall back to msvc depfile format.
set(CMAKE_DEPFILE_FLAGS_C "/showIncludes")
set(CMAKE_C_DEPFILE_FORMAT msvc)
endif()

22
Modules/Platform/Windows-Intel-CXX.cmake
View File

@@ -1,12 +1,28 @@
include(Platform/Windows-Intel)
set(_COMPILE_CXX " /TP")
__windows_compiler_intel(CXX)
set(CMAKE_NINJA_DEPTYPE_CXX intel) # special value handled by CMake
set(CMAKE_DEPFILE_FLAGS_CXX "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
set(CMAKE_CXX_DEPFILE_FORMAT gcc)
if(CMAKE_GENERATOR MATCHES "^Ninja")
if(_CMAKE_NINJA_VERSION VERSION_LESS 1.9)
# This ninja version is too old to support the Intel depfile format.
# Fall back to msvc depfile format.
set(CMAKE_DEPFILE_FLAGS_CXX "/showIncludes")
set(CMAKE_CXX_DEPFILE_FORMAT msvc)
endif()
endif()
if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
AND CMAKE_GENERATOR MATCHES "Makefiles|WMake")
# dependencies are computed by the compiler itself
set(CMAKE_CXX_DEPFILE_FORMAT gcc)
set(CMAKE_CXX_DEPENDS_USE_COMPILER TRUE)
set(CMAKE_CXX_DEPENDS_USE_COMPILER TRUE)
endif()
if("${CMAKE_SOURCE_DIR}${CMAKE_BINARY_DIR}" MATCHES " ")
# The Intel compiler does not properly escape spaces in a depfile.
# Fall back to msvc depfile format.
set(CMAKE_DEPFILE_FLAGS_CXX "/showIncludes")
set(CMAKE_CXX_DEPFILE_FORMAT msvc)
endif()

14
Modules/Platform/Windows-Intel.cmake
View File

@@ -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})

3
Modules/Platform/Windows-MSVC.cmake
View File

@@ -435,11 +435,10 @@ macro(__windows_compiler_msvc lang)
set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL -MDd)
endif()
set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
set(CMAKE_NINJA_DEPTYPE_${lang} msvc)
__windows_compiler_msvc_enable_rc("${_PLATFORM_DEFINES} ${_PLATFORM_DEFINES_${lang}}")
# define generic information about compiler dependencies
# activation is done on per language platform configuration basis
if (MSVC_VERSION GREATER 1300)
set(CMAKE_DEPFILE_FLAGS_${lang} "/showIncludes")
set(CMAKE_${lang}_DEPFILE_FORMAT msvc)