[cmake-developers] [PATCH] Windows-GNU, CYGWIN-GNU: Include corresponding windres script

Timothy Gu timothygu99 at gmail.com
Tue Oct 21 20:08:13 EDT 2014


This is my first post to the mailing list. If possible, this patch should
be backported to CMake 3.1 as well.

---->8----
GNU toolchains on Windows and Cygwin always use windres.

Fixes #7235.

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
---
 Modules/Platform/CYGWIN-GNU.cmake  | 1 +
 Modules/Platform/Windows-GNU.cmake | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Modules/Platform/CYGWIN-GNU.cmake b/Modules/Platform/CYGWIN-GNU.cmake
index fe25ab2..f193613 100644
--- a/Modules/Platform/CYGWIN-GNU.cmake
+++ b/Modules/Platform/CYGWIN-GNU.cmake
@@ -26,6 +26,7 @@ set(CMAKE_GNULD_IMAGE_VERSION
   "-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
 set(CMAKE_GENERATOR_RC windres)
 enable_language(RC)
+include(Platform/CYGWIN-windres)
 macro(__cygwin_compiler_gnu lang)
   # Binary link rules.
   set(CMAKE_${lang}_CREATE_SHARED_MODULE
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index ffc5657..1ea676e 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -61,6 +61,8 @@ if(NOT CMAKE_GENERATOR_RC AND CMAKE_GENERATOR MATCHES "Unix Makefiles")
   set(CMAKE_GENERATOR_RC windres)
 endif()
 
+include(Platform/Windows-windres)
+
 enable_language(RC)
 
 macro(__windows_compiler_gnu lang)
-- 
1.9.1




More information about the cmake-developers mailing list