Improve handling of pystring include dir (#1901)

Signed-off-by: Rémi Achard <[email protected]> Co-authored-by: Doug Walker <[email protected]>
AcademySoftwareFoundation · Nov 14, 2023 · 9078753 · 9078753
1 parent 382dcb6
commit 9078753
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 24 deletions.
diff --git a/share/cmake/modules/Findpystring.cmake b/share/cmake/modules/Findpystring.cmake
@@ -28,11 +28,12 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
     # Find include directory
     find_path(pystring_INCLUDE_DIR
         NAMES
-            pystring/pystring.h
+            pystring.h
         HINTS
             ${pystring_ROOT}
         PATH_SUFFIXES
             include
+            include/pystring
             pystring/include
     )
 

diff --git a/share/cmake/modules/install/Installpystring.cmake b/share/cmake/modules/install/Installpystring.cmake
@@ -38,7 +38,7 @@ if(NOT pystring_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PAC
     else()
         set(pystring_VERSION ${pystring_FIND_VERSION})
     endif()
-    set(pystring_INCLUDE_DIR "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}")
+    set(pystring_INCLUDE_DIR "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}/pystring")
 
     set(pystring_LIBRARY 
         "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}pystring${CMAKE_STATIC_LIBRARY_SUFFIX}")

diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp
@@ -12,6 +12,8 @@
 #include <regex>
 #include <functional>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "builtinconfigs/BuiltinConfigRegistry.h"
@@ -34,7 +36,6 @@
 #include "Platform.h"
 #include "PrivateTypes.h"
 #include "Processor.h"
-#include "pystring/pystring.h"
 #include "transforms/FileTransform.h"
 #include "utils/StringUtils.h"
 #include "ViewingRules.h"

diff --git a/src/OpenColorIO/Context.cpp b/src/OpenColorIO/Context.cpp
@@ -7,6 +7,8 @@
 #include <sstream>
 #include <string>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "ContextVariableUtils.h"
@@ -15,7 +17,6 @@
 #include "OCIOZArchive.h"
 #include "PathUtils.h"
 #include "PrivateTypes.h"
-#include "pystring/pystring.h"
 #include "utils/StringUtils.h"
 
 namespace OCIO_NAMESPACE

diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp
@@ -4,6 +4,8 @@
 #include <cstring>
 #include <unordered_set>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "Display.h"
@@ -19,7 +21,6 @@
 #include "ParseUtils.h"
 #include "PathUtils.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "utils/StringUtils.h"
 #include "ViewingRules.h"
 #include "yaml-cpp/yaml.h"

diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp
@@ -8,10 +8,12 @@
 #include <set>
 #include <limits>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
+
 #include "Mutex.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "utils/StringUtils.h"
 #include "transforms/FileTransform.h"
 

diff --git a/src/OpenColorIO/Op.cpp b/src/OpenColorIO/Op.cpp
@@ -4,6 +4,8 @@
 #include <cstring>
 #include <sstream>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "Logging.h"
@@ -20,7 +22,6 @@
 #include "ops/lut1d/Lut1DOp.h"
 #include "ops/lut3d/Lut3DOp.h"
 #include "ops/range/RangeOp.h"
-#include "pystring/pystring.h"
 
 namespace OCIO_NAMESPACE
 {

diff --git a/src/OpenColorIO/PathUtils.cpp b/src/OpenColorIO/PathUtils.cpp
@@ -5,12 +5,13 @@
 #include <iostream>
 #include <map>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "Mutex.h"
 #include "PathUtils.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "utils/StringUtils.h"
 #include "OCIOZArchive.h"
 
@@ -218,4 +219,3 @@ int ParseColorSpaceFromString(const Config & config, const char * str)
 }
 
 } // namespace OCIO_NAMESPACE
-
diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp
@@ -6,6 +6,8 @@
 #include <fstream>
 #include <sstream>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "expat.h"
@@ -23,7 +25,6 @@
 #include "OpBuilders.h"
 #include "ops/noop/NoOps.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "TransformBuilder.h"
 #include "transforms/FileTransform.h"
 #include "utils/StringUtils.h"

diff --git a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
@@ -8,6 +8,8 @@
 #include <sstream>
 #include <iostream>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "BitDepthUtils.h"
@@ -16,7 +18,6 @@
 #include "ops/lut1d/Lut1DOp.h"
 #include "ops/lut3d/Lut3DOp.h"
 #include "ParseUtils.h"
-#include "pystring/pystring.h"
 #include "Platform.h"
 #include "transforms/FileTransform.h"
 #include "utils/StringUtils.h"
@@ -771,4 +772,3 @@ FileFormat * CreateFileFormatDiscreet1DL()
 }
 
 } // namespace OCIO_NAMESPACE
-
diff --git a/src/OpenColorIO/fileformats/FileFormatICC.cpp b/src/OpenColorIO/fileformats/FileFormatICC.cpp
@@ -5,6 +5,8 @@
 #include <sstream>
 #include <fstream>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "Logging.h"
@@ -15,7 +17,6 @@
 #include "ops/matrix/MatrixOp.h"
 #include "ops/range/RangeOp.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "transforms/FileTransform.h"
 
 

diff --git a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
@@ -5,6 +5,8 @@
 #include <cstring>
 #include <iterator>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "expat.h"
@@ -13,7 +15,6 @@
 #include "ops/lut3d/Lut3DOp.h"
 #include "ParseUtils.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "transforms/FileTransform.h"
 #include "utils/StringUtils.h"
 #include "utils/NumberUtils.h"
@@ -579,4 +580,3 @@ FileFormat * CreateFileFormatIridasLook()
 }
 
 } // namespace OCIO_NAMESPACE
-
diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp
@@ -9,6 +9,8 @@
 #include <iostream>
 #include <iterator>
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "Caching.h"
@@ -19,7 +21,6 @@
 #include "ops/noop/NoOps.h"
 #include "PathUtils.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "utils/StringUtils.h"
 
 namespace OCIO_NAMESPACE

diff --git a/tests/cpu/ColorSpace_tests.cpp b/tests/cpu/ColorSpace_tests.cpp
@@ -4,9 +4,10 @@
 
 #include <sstream>
 
+#include <pystring.h>
+
 #include "ColorSpace.cpp"
 
-#include <pystring/pystring.h>
 #include "testutils/UnitTest.h"
 #include "UnitTestUtils.h"
 

diff --git a/tests/cpu/Config_tests.cpp b/tests/cpu/Config_tests.cpp
@@ -4,10 +4,10 @@
 
 #include <sys/stat.h>
 
+#include <pystring.h>
+
 #include "Config.cpp"
-#include "utils/StringUtils.h"
 
-#include <pystring/pystring.h>
 #include "testutils/UnitTest.h"
 #include "UnitTestLogUtils.h"
 #include "UnitTestUtils.h"

diff --git a/tests/cpu/Context_tests.cpp b/tests/cpu/Context_tests.cpp
@@ -4,11 +4,12 @@
 
 #include <algorithm>
 
+#include <pystring.h>
+
 #include "Context.cpp"
 
 #include "PathUtils.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "testutils/UnitTest.h"
 
 namespace OCIO = OCIO_NAMESPACE;
@@ -171,5 +172,3 @@ OCIO_ADD_TEST(Context, string_vars)
     OCIO_CHECK_EQUAL(std::string("var3"), ctx1->getStringVarNameByIndex(2));
     OCIO_CHECK_EQUAL(std::string("val3"), ctx1->getStringVarByIndex(2));
 }
-
-
diff --git a/tests/cpu/UnitTestUtils.h b/tests/cpu/UnitTestUtils.h
@@ -13,12 +13,13 @@
 # endif
 #endif
 
+#include <pystring.h>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "MathUtils.h"
 #include "Op.h"
 #include "Platform.h"
-#include "pystring/pystring.h"
 #include "CPUInfoConfig.h"
 
 namespace OCIO_NAMESPACE

diff --git a/vendor/openfx/OCIOUtils.cpp b/vendor/openfx/OCIOUtils.cpp
@@ -8,8 +8,9 @@ namespace OCIO = OCIO_NAMESPACE;
 #include <sstream>
 #include <vector>
 
+#include <pystring.h>
+
 #include "ofxsLog.h"
-#include "pystring/pystring.h"
 
 namespace
 {