summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-11-19 14:10:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-11-19 14:10:23 (GMT)
commit65b9d1f228efb1d028c3682ec5637f431cbc3fc5 (patch)
treeb2c6885962c03dfc1426dea3dd731a51a96e8a2d /Tests
parent4e333e3b32ba2b19b5fb07b9764264add34984b7 (diff)
parentca263d1d71d953630e31daa7771dde3c6835b9a2 (diff)
downloadCMake-65b9d1f228efb1d028c3682ec5637f431cbc3fc5.zip
CMake-65b9d1f228efb1d028c3682ec5637f431cbc3fc5.tar.gz
CMake-65b9d1f228efb1d028c3682ec5637f431cbc3fc5.tar.bz2
Merge topic 'fix-ms-manifest-no-linker'
ca263d1d MSVC: Fix linking with /MANIFEST:NO option
Diffstat (limited to 'Tests')
-rw-r--r--Tests/MSManifest/Subdir/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Tests/MSManifest/Subdir/CMakeLists.txt b/Tests/MSManifest/Subdir/CMakeLists.txt
index a47cf00..11272bb 100644
--- a/Tests/MSManifest/Subdir/CMakeLists.txt
+++ b/Tests/MSManifest/Subdir/CMakeLists.txt
@@ -6,4 +6,6 @@ if(MSVC AND NOT MSVC_VERSION LESS 1400)
COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:MSManifest>
-P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake
)
+ add_executable(MSManifestNone main.c)
+ set_property(TARGET MSManifestNone PROPERTY LINK_FLAGS "/MANIFEST:NO")
endif()