summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-25 16:12:06 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-25 16:16:19 (GMT)
commit1de4a0fb09fded1401ecb1aeaecb1159ae46a3c6 (patch)
tree7bddb1b573254bf1220f53bc58dc0020daef2190
parent1826aadcf3ee7f0d3a35927d32226513d265accc (diff)
downloadCMake-1de4a0fb09fded1401ecb1aeaecb1159ae46a3c6.zip
CMake-1de4a0fb09fded1401ecb1aeaecb1159ae46a3c6.tar.gz
CMake-1de4a0fb09fded1401ecb1aeaecb1159ae46a3c6.tar.bz2
RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting
This variable has long been replaced by CMAKE_RC_COMPILE_OBJECT. Stop setting it in platform modules.
-rw-r--r--Modules/Platform/Windows-MSVC.cmake1
-rw-r--r--Modules/Platform/Windows-df.cmake2
2 files changed, 0 insertions, 3 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 2440f89..b101b63 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -55,7 +55,6 @@ endif()
# make sure to enable languages after setting configuration types
enable_language(RC)
-set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
set(MSVC_IDE 1)
diff --git a/Modules/Platform/Windows-df.cmake b/Modules/Platform/Windows-df.cmake
index 59d88a3..0beba73 100644
--- a/Modules/Platform/Windows-df.cmake
+++ b/Modules/Platform/Windows-df.cmake
@@ -24,8 +24,6 @@ set(CMAKE_Fortran_CREATE_STATIC_LIBRARY "lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /o
set(CMAKE_Fortran_COMPILE_OBJECT
"<CMAKE_Fortran_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} /object:<OBJECT> <FLAGS> /compile_only <SOURCE>${CMAKE_END_TEMP_FILE}")
-set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
-
set(CMAKE_Fortran_LINK_EXECUTABLE
"<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /exe:<TARGET> <OBJECTS> /link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")