Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve handling of pystring include dir #1901

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Improve handling of pystring include dir #1901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
473013c
Improve handling of pystring include dir
remia Nov 6, 2023
afc13a7
Merge branch 'main' into pystring-find-improvement
doug-walker Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion share/cmake/modules/Findpystring.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion share/cmake/modules/install/Installpystring.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
3 changes: 2 additions & 1 deletion src/OpenColorIO/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include <regex>
#include <functional>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "builtinconfigs/BuiltinConfigRegistry.h"
Expand All @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion src/OpenColorIO/Context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <sstream>
#include <string>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "ContextVariableUtils.h"
Expand All @@ -15,7 +17,6 @@
#include "OCIOZArchive.h"
#include "PathUtils.h"
#include "PrivateTypes.h"
#include "pystring/pystring.h"
#include "utils/StringUtils.h"

namespace OCIO_NAMESPACE
Expand Down
3 changes: 2 additions & 1 deletion src/OpenColorIO/OCIOYaml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <cstring>
#include <unordered_set>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "Display.h"
Expand All @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion src/OpenColorIO/OCIOZArchive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion src/OpenColorIO/Op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <cstring>
#include <sstream>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "Logging.h"
Expand All @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/OpenColorIO/PathUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -218,4 +219,3 @@ int ParseColorSpaceFromString(const Config & config, const char * str)
}

} // namespace OCIO_NAMESPACE

3 changes: 2 additions & 1 deletion src/OpenColorIO/fileformats/FileFormatCTF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include <fstream>
#include <sstream>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "expat.h"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include <sstream>
#include <iostream>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "BitDepthUtils.h"
Expand All @@ -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"
Expand Down Expand Up @@ -771,4 +772,3 @@ FileFormat * CreateFileFormatDiscreet1DL()
}

} // namespace OCIO_NAMESPACE

3 changes: 2 additions & 1 deletion src/OpenColorIO/fileformats/FileFormatICC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <sstream>
#include <fstream>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "Logging.h"
Expand All @@ -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"


Expand Down
4 changes: 2 additions & 2 deletions src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <cstring>
#include <iterator>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "expat.h"
Expand All @@ -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"
Expand Down Expand Up @@ -579,4 +580,3 @@ FileFormat * CreateFileFormatIridasLook()
}

} // namespace OCIO_NAMESPACE

3 changes: 2 additions & 1 deletion src/OpenColorIO/transforms/FileTransform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <iostream>
#include <iterator>

#include <pystring.h>

#include <OpenColorIO/OpenColorIO.h>

#include "Caching.h"
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/cpu/ColorSpace_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@

#include <sstream>

#include <pystring.h>

#include "ColorSpace.cpp"

#include <pystring/pystring.h>
#include "testutils/UnitTest.h"
#include "UnitTestUtils.h"

Expand Down
4 changes: 2 additions & 2 deletions tests/cpu/Config_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions tests/cpu/Context_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}


3 changes: 2 additions & 1 deletion tests/cpu/UnitTestUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion vendor/openfx/OCIOUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ namespace OCIO = OCIO_NAMESPACE;
#include <sstream>
#include <vector>

#include <pystring.h>

#include "ofxsLog.h"
#include "pystring/pystring.h"

namespace
{
Expand Down