From 79c8a471024aeb125fb1bd3a368e9a8a6db65704 Mon Sep 17 00:00:00 2001 From: Ingmar Rieger Date: Mon, 6 Nov 2023 22:07:42 +0100 Subject: [PATCH] Proposed fix for pystring include paths Make Findpystring.cmake return the full include directory to pystring so that prefixing includes with "pystring/" is no longer required. Signed-off-by: Ingmar Rieger --- share/cmake/modules/Findpystring.cmake | 3 ++- src/OpenColorIO/Config.cpp | 2 +- src/OpenColorIO/Context.cpp | 2 +- src/OpenColorIO/OCIOYaml.cpp | 2 +- src/OpenColorIO/OCIOZArchive.cpp | 2 +- src/OpenColorIO/Op.cpp | 2 +- src/OpenColorIO/PathUtils.cpp | 2 +- src/OpenColorIO/fileformats/FileFormatCTF.cpp | 2 +- src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp | 2 +- src/OpenColorIO/fileformats/FileFormatICC.cpp | 2 +- src/OpenColorIO/fileformats/FileFormatIridasLook.cpp | 2 +- src/OpenColorIO/transforms/FileTransform.cpp | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/share/cmake/modules/Findpystring.cmake b/share/cmake/modules/Findpystring.cmake index c466115476..df584aa462 100644 --- a/share/cmake/modules/Findpystring.cmake +++ b/share/cmake/modules/Findpystring.cmake @@ -28,12 +28,13 @@ 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 pystring/include + include/pystring ) # Find library diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp index a17d1dc288..b03cac08f9 100644 --- a/src/OpenColorIO/Config.cpp +++ b/src/OpenColorIO/Config.cpp @@ -34,7 +34,7 @@ #include "Platform.h" #include "PrivateTypes.h" #include "Processor.h" -#include "pystring/pystring.h" +#include "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 index bb6fb07f31..a8890edd25 100644 --- a/src/OpenColorIO/Context.cpp +++ b/src/OpenColorIO/Context.cpp @@ -15,7 +15,7 @@ #include "OCIOZArchive.h" #include "PathUtils.h" #include "PrivateTypes.h" -#include "pystring/pystring.h" +#include "pystring.h" #include "utils/StringUtils.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp index 62cbb0d001..59c1564633 100644 --- a/src/OpenColorIO/OCIOYaml.cpp +++ b/src/OpenColorIO/OCIOYaml.cpp @@ -19,7 +19,7 @@ #include "ParseUtils.h" #include "PathUtils.h" #include "Platform.h" -#include "pystring/pystring.h" +#include "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 index 24d836e952..a9177eb2b2 100644 --- a/src/OpenColorIO/OCIOZArchive.cpp +++ b/src/OpenColorIO/OCIOZArchive.cpp @@ -11,7 +11,7 @@ #include #include "Mutex.h" #include "Platform.h" -#include "pystring/pystring.h" +#include "pystring.h" #include "utils/StringUtils.h" #include "transforms/FileTransform.h" diff --git a/src/OpenColorIO/Op.cpp b/src/OpenColorIO/Op.cpp index e1bd564ff9..cf05c37527 100755 --- a/src/OpenColorIO/Op.cpp +++ b/src/OpenColorIO/Op.cpp @@ -20,7 +20,7 @@ #include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" #include "ops/range/RangeOp.h" -#include "pystring/pystring.h" +#include "pystring.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/PathUtils.cpp b/src/OpenColorIO/PathUtils.cpp index 9dc8c6b743..4a1096dffd 100644 --- a/src/OpenColorIO/PathUtils.cpp +++ b/src/OpenColorIO/PathUtils.cpp @@ -10,7 +10,7 @@ #include "Mutex.h" #include "PathUtils.h" #include "Platform.h" -#include "pystring/pystring.h" +#include "pystring.h" #include "utils/StringUtils.h" #include "OCIOZArchive.h" diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp index ebed326c9f..9f70ff8249 100644 --- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp @@ -23,7 +23,7 @@ #include "OpBuilders.h" #include "ops/noop/NoOps.h" #include "Platform.h" -#include "pystring/pystring.h" +#include "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 index a52bc728f1..bd827f0617 100755 --- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp +++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp @@ -16,7 +16,7 @@ #include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" #include "ParseUtils.h" -#include "pystring/pystring.h" +#include "pystring.h" #include "Platform.h" #include "transforms/FileTransform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatICC.cpp b/src/OpenColorIO/fileformats/FileFormatICC.cpp index 1fcfd9adcf..ca5d9b49d5 100755 --- a/src/OpenColorIO/fileformats/FileFormatICC.cpp +++ b/src/OpenColorIO/fileformats/FileFormatICC.cpp @@ -15,7 +15,7 @@ #include "ops/matrix/MatrixOp.h" #include "ops/range/RangeOp.h" #include "Platform.h" -#include "pystring/pystring.h" +#include "pystring.h" #include "transforms/FileTransform.h" diff --git a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp index 7402efd095..cc3acb41ad 100755 --- a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp +++ b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp @@ -13,7 +13,7 @@ #include "ops/lut3d/Lut3DOp.h" #include "ParseUtils.h" #include "Platform.h" -#include "pystring/pystring.h" +#include "pystring.h" #include "transforms/FileTransform.h" #include "utils/StringUtils.h" #include "utils/NumberUtils.h" diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp index 4fd4d5d475..dc5eb3c974 100755 --- a/src/OpenColorIO/transforms/FileTransform.cpp +++ b/src/OpenColorIO/transforms/FileTransform.cpp @@ -19,7 +19,7 @@ #include "ops/noop/NoOps.h" #include "PathUtils.h" #include "Platform.h" -#include "pystring/pystring.h" +#include "pystring.h" #include "utils/StringUtils.h" namespace OCIO_NAMESPACE