diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-26 14:28:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-26 14:28:50 (GMT) |
| commit | cd553c34d618afba1312f4a4b1d289c7ba094d63 (patch) | |
| tree | 0c1718292cce1a96cb8fb740d9ae97cba13bc117 /Tests | |
| parent | d36d5d8ffeac0b0d8b49e1ffb75c66fc33cc944f (diff) | |
| parent | fe7f8c99a459f93df594a8e5c5f49389d71ae128 (diff) | |
| download | CMake-cd553c34d618afba1312f4a4b1d289c7ba094d63.zip CMake-cd553c34d618afba1312f4a4b1d289c7ba094d63.tar.gz CMake-cd553c34d618afba1312f4a4b1d289c7ba094d63.tar.bz2 | |
Merge topic 'wix-fix-shortcut-ids'
fe7f8c9 CPackWiX: use safe IDs for generated start menu shortcuts
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CPackWiXGenerator/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | Tests/CPackWiXGenerator/myotherapp.cpp | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Tests/CPackWiXGenerator/CMakeLists.txt b/Tests/CPackWiXGenerator/CMakeLists.txt index 475e60d..b54925a 100644 --- a/Tests/CPackWiXGenerator/CMakeLists.txt +++ b/Tests/CPackWiXGenerator/CMakeLists.txt @@ -4,15 +4,17 @@ project(CPackWiXGenerator) add_library(mylib mylib.cpp) -add_executable(mylibapp mylibapp.cpp) -target_link_libraries(mylibapp mylib) +add_executable(my-libapp mylibapp.cpp) +target_link_libraries(my-libapp mylib) + +add_executable(my-other-app myotherapp.cpp) install(TARGETS mylib ARCHIVE DESTINATION lib COMPONENT libraries) -install(TARGETS mylibapp +install(TARGETS my-libapp my-other-app RUNTIME DESTINATION bin COMPONENT applications) @@ -36,7 +38,11 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example") set(CPACK_WIX_UPGRADE_GUID "BF20CE5E-7F7C-401D-8F7C-AB45E8D170E6") set(CPACK_WIX_UNINSTALL "1") -set(CPACK_PACKAGE_EXECUTABLES "mylibapp; CPack Wix Test") + +set(CPACK_PACKAGE_EXECUTABLES + "my-libapp" "CPack WiX Test" + "my-other-app" "Second CPack WiX Test" +) include(CPack) diff --git a/Tests/CPackWiXGenerator/myotherapp.cpp b/Tests/CPackWiXGenerator/myotherapp.cpp new file mode 100644 index 0000000..c272dab --- /dev/null +++ b/Tests/CPackWiXGenerator/myotherapp.cpp @@ -0,0 +1 @@ +int main() {}
\ No newline at end of file |