mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-23 22:58:37 -05:00
Merge topic 'ninja-gcc-windows'
20560e8dNinja: Do not use newlines in response files with Windows GNU tools (#15439)b3de0dfeNinja: Use forward slashes for any GCC on Windows (#15439)378c2a0eNinja: Refactor detection of MinGW tools on Windows957c2aacRC: Simplify selection of resource compiler based on C/C++ toolchain
This commit is contained in:
@@ -53,5 +53,9 @@ macro(__cygwin_compiler_gnu lang)
|
||||
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,--enable-auto-import")
|
||||
set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS}")
|
||||
|
||||
if(NOT CMAKE_RC_COMPILER_INIT)
|
||||
set(CMAKE_RC_COMPILER_INIT windres)
|
||||
endif()
|
||||
|
||||
enable_language(RC)
|
||||
endmacro()
|
||||
|
||||
@@ -138,6 +138,10 @@ macro(__windows_compiler_gnu lang)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
if(NOT CMAKE_RC_COMPILER_INIT)
|
||||
set(CMAKE_RC_COMPILER_INIT windres)
|
||||
endif()
|
||||
|
||||
enable_language(RC)
|
||||
endmacro()
|
||||
|
||||
|
||||
@@ -298,6 +298,9 @@ macro(__windows_compiler_msvc lang)
|
||||
set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG")
|
||||
set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
|
||||
|
||||
if(NOT CMAKE_RC_COMPILER_INIT)
|
||||
set(CMAKE_RC_COMPILER_INIT rc)
|
||||
endif()
|
||||
if(NOT CMAKE_RC_FLAGS_INIT)
|
||||
set(CMAKE_RC_FLAGS_INIT "${_PLATFORM_DEFINES} ${_PLATFORM_DEFINES_${lang}}")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user