Enable custom install subfolder for headers

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
AcademySoftwareFoundation · Jul 17, 2019 · 9067b79 · 9067b79
1 parent edb6938
commit 9067b79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/IlmBase/config/IlmBaseSetup.cmake b/IlmBase/config/IlmBaseSetup.cmake
@@ -26,12 +26,9 @@ set(ILMBASE_PACKAGE_NAME "IlmBase ${ILMBASE_VERSION}" CACHE STRING "Public strin
 ########################
 ## Build related options
 
-# This is a variable here for use in install lines, but OpenEXR pretty much
-# relies on this code to be intermingled currently... but someone
-# who is making an ilmbase only package could put it somewhere else...
-# NB: If you want to change this, make sure places like the pkgconfig
-# file are updated as appropriate
-set(ILMBASE_OUTPUT_SUBDIR OpenEXR)
+# This is a variable here for use in install lines. Care must be taken
+# when changing this, as many things assume this is OpenEXR
+set(ILMBASE_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install")
 
 # This does not seem to be available as a per-target property,
 # but is pretty harmless to set globally

diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake
@@ -19,8 +19,10 @@ set(OPENEXR_PACKAGE_NAME "IlmBase ${ILMBASE_VERSION}" CACHE STRING "Public strin
 # Whether to build & install the various command line utility programs
 option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON)
 
-# The sub directory if include that library headers end up in
-set(OPENEXR_OUTPUT_SUBDIR OpenEXR)
+# This is a variable here for use in controlling where include files are 
+# installed. Care must be taken when changing this, as many things
+# probably assume this is OpenEXR
+set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install")
 
 # This does not seem to be available as a per-target property,
 # but is pretty harmless to set globally