summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-04-10 17:44:39 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-04-10 17:44:39 (GMT)
commitbad1215a853a24f9e8145f6157be9e27c0b83cd0 (patch)
tree4164a0426efbe7967fcd865174c09bb243e530ac /Modules
parente4f3568099830233e0620c8824bb0a07376cd5a5 (diff)
downloadCMake-bad1215a853a24f9e8145f6157be9e27c0b83cd0.zip
CMake-bad1215a853a24f9e8145f6157be9e27c0b83cd0.tar.gz
CMake-bad1215a853a24f9e8145f6157be9e27c0b83cd0.tar.bz2
ENH: Add support for preinstall for cmake generated projects when packaging them
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPack.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index c20da16..86eca58 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -12,7 +12,7 @@ MACRO(cpack_set_if_not_set name value)
ENDMACRO(cpack_set_if_not_set)
# Set the package name
-cpack_set_if_not_set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+cpack_set_if_not_set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
cpack_set_if_not_set(CPACK_PACKAGE_VERSION_MAJOR "0")
cpack_set_if_not_set(CPACK_PACKAGE_VERSION_MINOR "1")
cpack_set_if_not_set(CPACK_PACKAGE_VERSION_PATCH "1")
@@ -20,7 +20,7 @@ cpack_set_if_not_set(CPACK_PACKAGE_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
cpack_set_if_not_set(CPACK_PACKAGE_VENDOR "Humanity")
cpack_set_if_not_set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
- "${PROJECT_NAME} built using CMake")
+ "${CMAKE_PROJECT_NAME} built using CMake")
cpack_set_if_not_set(CPACK_PACKAGE_DESCRIPTION_FILE
"${CMAKE_ROOT}/Templates/CPack.GenericDescription.txt")
@@ -70,6 +70,7 @@ ENDIF(NOT CPACK_GENERATOR)
cpack_set_if_not_set(CPACK_BINARY_DIR "${CMAKE_BINARY_DIR}")
cpack_set_if_not_set(CPACK_INSTALL_CMAKE_PROJECTS
"${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME}")
+cpack_set_if_not_set(CPACK_CMAKE_GENERATOR "${CMAKE_GENERATOR}")
SET(_CPACK_UNUSED_VARIABLES_)
GET_CMAKE_PROPERTY(res VARIABLES)