diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-22 13:10:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-22 13:10:39 (GMT) |
| commit | 286bdad53108c0cdd80a27d62c421e65bd4e8e26 (patch) | |
| tree | 6f1357ead5ca529b901c9de31344430a2be9f6f3 /Source/CPack/cmCPackPackageMakerGenerator.cxx | |
| parent | b1745dcbca6f70e7fd3d78d75dc1aa851e5d0a47 (diff) | |
| parent | 59ad7a1c243022284f8475e0bebbe1864ee23928 (diff) | |
| download | CMake-286bdad53108c0cdd80a27d62c421e65bd4e8e26.zip CMake-286bdad53108c0cdd80a27d62c421e65bd4e8e26.tar.gz CMake-286bdad53108c0cdd80a27d62c421e65bd4e8e26.tar.bz2 | |
Merge topic 'rename-cmProp-in-cmValue'
59ad7a1c24 Move helpers functions from cmStringAlgorithms.h to cmValue.h
edf67dd039 cmValue: add IsInternallyOn methods
cc56dc7468 Rename cmProp in cmValue
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6554
Diffstat (limited to 'Source/CPack/cmCPackPackageMakerGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 2915616..a8cf1fa 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -16,9 +16,9 @@ #include "cmCPackLog.h" #include "cmDuration.h" #include "cmGeneratedFileStream.h" -#include "cmProperty.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" +#include "cmValue.h" #include "cmXMLWriter.h" static inline unsigned int getVersion(unsigned int major, unsigned int minor) @@ -80,9 +80,9 @@ int cmCPackPackageMakerGenerator::PackageFiles() resDir += "/en.lproj"; } - cmProp preflight = this->GetOption("CPACK_PREFLIGHT_SCRIPT"); - cmProp postflight = this->GetOption("CPACK_POSTFLIGHT_SCRIPT"); - cmProp postupgrade = this->GetOption("CPACK_POSTUPGRADE_SCRIPT"); + cmValue preflight = this->GetOption("CPACK_PREFLIGHT_SCRIPT"); + cmValue postflight = this->GetOption("CPACK_POSTFLIGHT_SCRIPT"); + cmValue postupgrade = this->GetOption("CPACK_POSTUPGRADE_SCRIPT"); if (this->Components.empty()) { // Create directory structure @@ -168,7 +168,7 @@ int cmCPackPackageMakerGenerator::PackageFiles() // Create the directory where downloaded component packages will // be placed. - cmProp userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY"); + cmValue userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY"); std::string uploadDirectory; if (userUploadDirectory && !userUploadDirectory->empty()) { uploadDirectory = userUploadDirectory; @@ -352,7 +352,7 @@ int cmCPackPackageMakerGenerator::InitializeInternal() "/PackageMaker.app/Contents/MacOS"); std::string pkgPath; - cmProp inst_program = this->GetOption("CPACK_INSTALLER_PROGRAM"); + cmValue inst_program = this->GetOption("CPACK_INSTALLER_PROGRAM"); if (inst_program && !inst_program->empty()) { pkgPath = inst_program; } else { @@ -427,7 +427,7 @@ int cmCPackPackageMakerGenerator::InitializeInternal() // Determine the package compatibility version. If it wasn't // specified by the user, we define it based on which features the // user requested. - cmProp packageCompat = this->GetOption("CPACK_OSX_PACKAGE_VERSION"); + cmValue packageCompat = this->GetOption("CPACK_OSX_PACKAGE_VERSION"); if (packageCompat && !packageCompat->empty()) { unsigned int majorVersion = 10; unsigned int minorVersion = 5; |