This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 6968cb0bd08a46072a39ea3d0b760f7add0e71fa (commit)
via eda9e88e44b7db1a31f80b6bd23f78a7dcf56037 (commit)
from a0f72e6bd9cd4a9d9c75843d045a29db85e9d8d2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6968cb0bd08a46072a39ea3d0b760f7add0e71fa
commit 6968cb0bd08a46072a39ea3d0b760f7add0e71fa
Merge: a0f72e6 eda9e88
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Sep 16 16:29:00 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 16 16:29:00 2015 -0400
Merge topic 'ms-manifest-files' into next
eda9e88e fixup! Add support for *.manifest source files with MSVC tools
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda9e88e44b7db1a31f80b6bd23f78a7dcf56037
commit eda9e88e44b7db1a31f80b6bd23f78a7dcf56037
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Sep 16 16:22:15 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Sep 16 16:22:15 2015 -0400
fixup! Add support for *.manifest source files with MSVC tools
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2c6a42c..fff04ce 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -276,6 +276,7 @@ if(BUILD_TESTING)
if(TEST_RESOURCES)
ADD_TEST_MACRO(VSResource VSResource)
endif()
+ ADD_TEST_MACRO(MSManifest MSManifest)
ADD_TEST_MACRO(Simple Simple)
ADD_TEST_MACRO(PreOrder PreOrder)
ADD_TEST_MACRO(MissingSourceFile MissingSourceFile)
diff --git a/Tests/MSManifest/CMakeLists.txt b/Tests/MSManifest/CMakeLists.txt
new file mode 100644
index 0000000..300cfa6
--- /dev/null
+++ b/Tests/MSManifest/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.3)
+project(MSManifest C)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+add_subdirectory(Subdir)
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>
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 1 +
Tests/MSManifest/CMakeLists.txt | 5 +++++
Tests/MSManifest/Subdir/CMakeLists.txt | 9 +++++++++
Tests/MSManifest/Subdir/check.cmake | 6 ++++++
.../{CMakeOnly/LinkInterfaceLoop => MSManifest/Subdir}/main.c | 0
.../Subdir/test.manifest.in} | 4 +---
6 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 Tests/MSManifest/CMakeLists.txt
create mode 100644 Tests/MSManifest/Subdir/CMakeLists.txt
create mode 100644 Tests/MSManifest/Subdir/check.cmake
copy Tests/{CMakeOnly/LinkInterfaceLoop => MSManifest/Subdir}/main.c (100%)
copy Tests/{RunCMake/BuildDepends/C-Exe-Manifest.step1.cmake =>
MSManifest/Subdir/test.manifest.in} (52%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
