summaryrefslogtreecommitdiffstats
path: root/Modules/Platform
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-08-30 15:54:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-08-30 15:54:32 (GMT)
commit98a6565b60e0505b3ad97030dfd6fa16476aea0b (patch)
tree4344f83f0441811b98603b5a2452971bfec4a7ab /Modules/Platform
parentbbcd177f30d8deff35e628f6e8e9740a4c9cf5b1 (diff)
parentbe9afbf4535f5dc3650ea41480b2c9a58d4f94c0 (diff)
downloadCMake-98a6565b60e0505b3ad97030dfd6fa16476aea0b.zip
CMake-98a6565b60e0505b3ad97030dfd6fa16476aea0b.tar.gz
CMake-98a6565b60e0505b3ad97030dfd6fa16476aea0b.tar.bz2
Merge topic 'mingw-unix-generator'
be9afbf Find mingw's windres also when Unix Makefiles are used
Diffstat (limited to 'Modules/Platform')
-rw-r--r--Modules/Platform/Windows-GNU.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index 50ba80b..2bb7a20 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -57,6 +57,10 @@ if("${_help}" MATCHES "GNU ld .* 2\\.1[1-6]")
set(__WINDOWS_GNU_LD_RESPONSE 0)
endif()
+if(NOT CMAKE_GENERATOR_RC AND CMAKE_GENERATOR MATCHES "Unix Makefiles")
+ set(CMAKE_GENERATOR_RC windres)
+endif()
+
enable_language(RC)
macro(__windows_compiler_gnu lang)