diff options
author | Brad King <brad.king@kitware.com> | 2013-11-04 12:53:25 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-04 12:53:25 (GMT) |
commit | f3698f7c4a19470eb2152ce5acfbce564cc6d4f5 (patch) | |
tree | 5475fa9bd7bbb976d65ab72ca82865e7c9eac291 /Tests | |
parent | e405380d06052ca7e86ab9ca297f3e89fe866932 (diff) | |
parent | 53d6ebb36079bd30c9033e4374fd8d31a2928b6a (diff) | |
download | CMake-f3698f7c4a19470eb2152ce5acfbce564cc6d4f5.zip CMake-f3698f7c4a19470eb2152ce5acfbce564cc6d4f5.tar.gz CMake-f3698f7c4a19470eb2152ce5acfbce564cc6d4f5.tar.bz2 |
Merge topic 'cpack-drag-n-drop-rez'
53d6ebb cpack: For DragNDrop generator, add sysroot option when calling Rez.
193029c cpack: For DragNDrop generator, add sysroot option when calling Rez.
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CPackComponentsForAll/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/CPackComponentsForAll/license.txt | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt index 8162f0c..ff40e30 100644 --- a/Tests/CPackComponentsForAll/CMakeLists.txt +++ b/Tests/CPackComponentsForAll/CMakeLists.txt @@ -59,6 +59,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_PATCH "2") set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example") +set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/license.txt) # Tell CPack all of the components to install. The "ALL" # refers to the fact that this is the set of components that @@ -120,4 +121,4 @@ if (NOT ("${CPackComponentWay}" STREQUAL "default")) set(CPACK_PROJECT_CONFIG_FILE ${CPackComponentsForAll_BINARY_DIR}/MyLibCPackConfig-${CPackComponentWay}.cmake) endif () # Include CPack to introduce the appropriate targets -include(CPack)
\ No newline at end of file +include(CPack) diff --git a/Tests/CPackComponentsForAll/license.txt b/Tests/CPackComponentsForAll/license.txt new file mode 100644 index 0000000..ba8ba48 --- /dev/null +++ b/Tests/CPackComponentsForAll/license.txt @@ -0,0 +1,3 @@ +LICENSE +------- +This is an installer created using CPack (http://www.cmake.org). No license provided. |