summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-22 14:13:37 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-06-22 14:13:39 (GMT)
commit426c83cf8fc0fded780f2430224a77e57046264b (patch)
tree0f8ead328fd91b39c73312d591dc7e29da3a1791 /Tests
parent751f0e0adca2c99c1bff5b911d78f861c32c228f (diff)
parent974f43338b09e6ae4342015e2cc088d751943cb0 (diff)
downloadCMake-426c83cf8fc0fded780f2430224a77e57046264b.zip
CMake-426c83cf8fc0fded780f2430224a77e57046264b.tar.gz
CMake-426c83cf8fc0fded780f2430224a77e57046264b.tar.bz2
Merge topic 'vs-rc-flags'
974f4333 VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !998
Diffstat (limited to 'Tests')
-rw-r--r--Tests/VSResource/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt
index ee660ed..718e624 100644
--- a/Tests/VSResource/CMakeLists.txt
+++ b/Tests/VSResource/CMakeLists.txt
@@ -50,5 +50,9 @@ add_library(ResourceLib STATIC lib.cpp lib.rc)
add_executable(VSResource main.cpp test.rc)
target_link_libraries(VSResource ResourceLib)
+if(MSVC AND NOT MSVC_VERSION VERSION_LESS 1600)
+ set_property(SOURCE test.rc PROPERTY COMPILE_FLAGS /nologo)
+endif()
+
set_property(TARGET VSResource
PROPERTY VS_GLOBAL_CMakeTestVsGlobalVariable "test val")