summaryrefslogtreecommitdiffstats
path: root/Tests/MSManifest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-11-18 14:10:51 (GMT)
committerBrad King <brad.king@kitware.com>2015-11-18 14:31:56 (GMT)
commitca263d1d71d953630e31daa7771dde3c6835b9a2 (patch)
tree59e1be952706fe8aea636aa409e825ccc107a9aa /Tests/MSManifest
parentb4a2ada297214119647b26df8abe394cd73ca53a (diff)
downloadCMake-ca263d1d71d953630e31daa7771dde3c6835b9a2.zip
CMake-ca263d1d71d953630e31daa7771dde3c6835b9a2.tar.gz
CMake-ca263d1d71d953630e31daa7771dde3c6835b9a2.tar.bz2
MSVC: Fix linking with /MANIFEST:NO option
Refactoring in commit v3.4.0-rc1~74^2~1 (MSVC: Rewrite manifest file handling with Makefile and Ninja, 2015-09-15) broke handling of this option. Fix it and add a test case.
Diffstat (limited to 'Tests/MSManifest')
-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()