ENH: Add CPACK_SET_DESTDIR handling to enable packaging of installed files in absolute locations. With this setting on, cpack will set the DESTDIR env var when building the package so that files end up in their intended locations. Default behavior is not to set DESTDIR for backwards compatibility. Helps address issue #4993 and issue #5257. Also, remove unused CPACK_USE_DESTDIR variable. ENH: Add variable CPACK_PACKAGING_INSTALL_PREFIX to allow overriding the CPack GetPackagingInstallPrefix from a project's CMakeLists file if necessary. Could be used to remove the annoying /usr prefix still used by default in the Mac PackageMaker generator.

1 files changed, 5 insertions, 7 deletions

diff --git a/Source/CPack/cmCPackGenericGenerator.h b/Source/CPack/cmCPackGenericGenerator.h
index 7e0b10a..ea59a91 100644
--- a/Source/CPack/cmCPackGenericGenerator.h
+++ b/Source/CPack/cmCPackGenericGenerator.h
@@ -18,7 +18,6 @@
 #ifndef cmCPackGenericGenerator_h
 #define cmCPackGenericGenerator_h
 
-
 #include "cmObject.h"
 
 #define cmCPackTypeMacro(class, superclass) \
@@ -102,8 +101,7 @@ protected:
   virtual int CompressFiles(const char* outFileName, const char* toplevel,
     const std::vector<std::string>& files);
   virtual const char* GetInstallPath();
-  virtual const char* GetInstallPrefix() { return "/"; }
-  virtual const char* GetTemporaryInstallDirectoryPostfix() { return ""; }
+  virtual const char* GetPackagingInstallPrefix();
 
   virtual std::string FindTemplate(const char* name);
   virtual bool ConfigureFile(const char* inName, const char* outName,
@@ -114,13 +112,13 @@ protected:
 
   //! Run install commands if specified
   virtual int InstallProjectViaInstallCommands(
-    bool movable, const char* tempInstallDirectory);
+    bool setDestDir, const char* tempInstallDirectory);
   virtual int InstallProjectViaInstallScript(
-    bool movable, const char* tempInstallDirectory);
+    bool setDestDir, const char* tempInstallDirectory);
   virtual int InstallProjectViaInstalledDirectories(
-    bool movable, const char* tempInstallDirectory);
+    bool setDestDir, const char* tempInstallDirectory);
   virtual int InstallProjectViaInstallCMakeProjects(
-    bool movable, const char* tempInstallDirectory);
+    bool setDestDir, const char* tempInstallDirectory);
 
   bool GeneratorVerbose;
   std::string Name;