reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-04 02:47:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not provide defaul value for CPACK_PACKAGE_DIRECTORY if found in config.

Browse Source 
This fixes bug #0012906.
This commit is contained in:
Eric NOULARD 2012-07-04 23:08:32 +02:00
parent c8bf86cf82
commit 05a8630ee6
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/CPack.cmake
View File

@ -63,6 +63,14 @@
##end ##end
# #
##variable ##variable
# CPACK_PACKAGE_DIRECTORY - The directory in which CPack is doing its
# packaging. If it is not set then this will default (internally) to the
# build dir. This variable may be defined in CPack config file or from
# the cpack command line option "-B". If set the command line option
# override the value found in the config file.
##end
#
##variable
# CPACK_PACKAGE_VERSION_MAJOR - Package major Version # CPACK_PACKAGE_VERSION_MAJOR - Package major Version
##end ##end
# #

19
Source/CPack/cpack.cxx
View File

@ -207,8 +207,7 @@ int main (int argc, char *argv[])
std::string helpHTML; std::string helpHTML;
std::string cpackProjectName; std::string cpackProjectName;
std::string cpackProjectDirectory std::string cpackProjectDirectory;
= cmsys::SystemTools::GetCurrentWorkingDirectory();
std::string cpackBuildConfig; std::string cpackBuildConfig;
std::string cpackProjectVersion; std::string cpackProjectVersion;
std::string cpackProjectPatch; std::string cpackProjectPatch;
@ -370,10 +369,24 @@ int main (int argc, char *argv[])
globalMF->AddDefinition("CPACK_PACKAGE_VENDOR", globalMF->AddDefinition("CPACK_PACKAGE_VENDOR",
cpackProjectVendor.c_str()); cpackProjectVendor.c_str());
} }
// if this is not empty it has been set on the command line
// go for it. Command line override values set in config file.
if ( !cpackProjectDirectory.empty() ) if ( !cpackProjectDirectory.empty() )
{ {
globalMF->AddDefinition("CPACK_PACKAGE_DIRECTORY", globalMF->AddDefinition("CPACK_PACKAGE_DIRECTORY",
cpackProjectDirectory.c_str()); cpackProjectDirectory.c_str());
}
// The value has not been set on the command line
else
{
// get a default value (current working directory)
cpackProjectDirectory = cmsys::SystemTools::GetCurrentWorkingDirectory();
// use default value iff no value has been provided by the config file
if (!globalMF->IsSet("CPACK_PACKAGE_DIRECTORY"))
{
globalMF->AddDefinition("CPACK_PACKAGE_DIRECTORY",
cpackProjectDirectory.c_str());
}
} }
if ( !cpackBuildConfig.empty() ) if ( !cpackBuildConfig.empty() )
{ {