From 8f9919d93cad64de58775e4a7609b0ffb37d061e Mon Sep 17 00:00:00 2001 From: David Cole Date: Wed, 26 Jan 2011 08:26:31 -0500 Subject: [PATCH] Avoid space in rc /D values for VS6 and Cygwin (#11695) Change to the test only. Using a space in an rc /D value will not work at present with VS6 or Cygwin rc compilers. --- Tests/VSResource/CMakeLists.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt index 8c14f8db2..5fbd572b7 100644 --- a/Tests/VSResource/CMakeLists.txt +++ b/Tests/VSResource/CMakeLists.txt @@ -1,13 +1,18 @@ cmake_minimum_required(VERSION 2.8.3.20110118) -project (VSResource) +project(VSResource) string(REPLACE "/INCREMENTAL:YES" "" CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}") -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test.txt - "${CMAKE_CURRENT_BINARY_DIR}/test with spaces.txt" COPYONLY) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) -add_definitions(/DCMAKE_RCDEFINE="test with spaces.txt") +if(MSVC60 OR CYGWIN) + # VS6 and Cygwin rc compilers do not deal well with spaces in a "/D" value + add_definitions(/DCMAKE_RCDEFINE="test.txt") +else() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test.txt + "${CMAKE_CURRENT_BINARY_DIR}/test with spaces.txt" COPYONLY) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + add_definitions(/DCMAKE_RCDEFINE="test with spaces.txt") +endif() add_executable(VSResource main.cpp test.rc)