diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-18 13:56:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-18 13:56:39 (GMT) |
| commit | 309026147a04d4a4744f6cca50717fe869069fea (patch) | |
| tree | b54dc88f7f60199af1fab8786bdfe4cceb53217c /Tests/MSManifest/Subdir | |
| parent | 732e86ef3ab872c3394730f489bd5a91217fd1ed (diff) | |
| parent | e134e53b47fc9f0337529ce2b6851cec6319a8af (diff) | |
| download | CMake-309026147a04d4a4744f6cca50717fe869069fea.zip CMake-309026147a04d4a4744f6cca50717fe869069fea.tar.gz CMake-309026147a04d4a4744f6cca50717fe869069fea.tar.bz2 | |
Merge topic 'ms-manifest-files'
e134e53b Add support for *.manifest source files with MSVC tools
da00be63 MSVC: Rewrite manifest file handling with Makefile and Ninja
d488b5c9 Ninja: Always add OBJECT_DIR variable to link rules
6d620f5a VS: Add manifest tool settings to VS 8 and 9 project files
Diffstat (limited to 'Tests/MSManifest/Subdir')
| -rw-r--r-- | Tests/MSManifest/Subdir/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/MSManifest/Subdir/check.cmake | 6 | ||||
| -rw-r--r-- | Tests/MSManifest/Subdir/main.c | 1 | ||||
| -rw-r--r-- | Tests/MSManifest/Subdir/test.manifest.in | 4 |
4 files changed, 20 insertions, 0 deletions
diff --git a/Tests/MSManifest/Subdir/CMakeLists.txt b/Tests/MSManifest/Subdir/CMakeLists.txt new file mode 100644 index 0000000..a47cf00 --- /dev/null +++ b/Tests/MSManifest/Subdir/CMakeLists.txt @@ -0,0 +1,9 @@ +configure_file(test.manifest.in test.manifest) +add_executable(MSManifest main.c ${CMAKE_CURRENT_BINARY_DIR}/test.manifest) + +if(MSVC AND NOT MSVC_VERSION LESS 1400) + add_custom_command(TARGET MSManifest POST_BUILD VERBATIM + COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:MSManifest> + -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake + ) +endif() diff --git a/Tests/MSManifest/Subdir/check.cmake b/Tests/MSManifest/Subdir/check.cmake new file mode 100644 index 0000000..b7b6841 --- /dev/null +++ b/Tests/MSManifest/Subdir/check.cmake @@ -0,0 +1,6 @@ +file(STRINGS "${exe}" content REGEX "name=\"Kitware.CMake.MSManifestTest\"") +if(content) + message(STATUS "Expected manifest content found:\n ${content}") +else() + message(FATAL_ERROR "Expected manifest content not found in\n ${exe}") +endif() diff --git a/Tests/MSManifest/Subdir/main.c b/Tests/MSManifest/Subdir/main.c new file mode 100644 index 0000000..78f2de1 --- /dev/null +++ b/Tests/MSManifest/Subdir/main.c @@ -0,0 +1 @@ +int main(void) { return 0; } diff --git a/Tests/MSManifest/Subdir/test.manifest.in b/Tests/MSManifest/Subdir/test.manifest.in new file mode 100644 index 0000000..540961a --- /dev/null +++ b/Tests/MSManifest/Subdir/test.manifest.in @@ -0,0 +1,4 @@ +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" version="1.0.0.0" + name="Kitware.CMake.MSManifestTest"/> +</assembly> |