summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cpack.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-10-12 17:05:50 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-10-12 17:05:50 (GMT)
commite31dc3abe554cdae307d654df9a245d8e72f55d4 (patch)
tree26e7b683763cc56765f0404c15bbb7458d8bdfae /Source/CPack/cpack.cxx
parent77a42276525e6ce89945af73b97d5a1d5886ad1b (diff)
downloadCMake-e31dc3abe554cdae307d654df9a245d8e72f55d4.zip
CMake-e31dc3abe554cdae307d654df9a245d8e72f55d4.tar.gz
CMake-e31dc3abe554cdae307d654df9a245d8e72f55d4.tar.bz2
ENH: Several CPack fixes. First, allow user to set CMAKE_MODULE_PATH for CPack; make SetOptionIfNotSet more robust to handle empty options; do test TGZ, STGZ, and TZ, Add handling (and test) of Install Script; set environment variable CMAKE_INSTALL_PREFIX
Diffstat (limited to 'Source/CPack/cpack.cxx')
-rw-r--r--Source/CPack/cpack.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 7c22d70..5a63a49 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -301,6 +301,11 @@ int main (int argc, char *argv[])
globalMF->AddDefinition(cdit->first.c_str(), cdit->second.c_str());
}
+ const char* cpackModulesPath = globalMF->GetDefinition("CPACK_MODULE_PATH");
+ if ( cpackModulesPath )
+ {
+ globalMF->AddDefinition("CMAKE_MODULE_PATH", cpackModulesPath);
+ }
const char* genList = globalMF->GetDefinition("CPACK_GENERATOR");
if ( !genList )
{