Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 683126
Collapse All | Expand All

(-)file_not_specified_in_diff (-2 / +17 lines)
Line  Link Here
0
-- openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake
0
++ openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake
Lines 27-32 Link Here
27
    set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
27
    set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
28
endif ()
28
endif ()
29
29
30
# Attempt to find OpenEXR with pkgconfig
31
find_package(PkgConfig)
32
if (PKG_CONFIG_FOUND)
33
    pkg_check_modules(_ILMBASE QUIET IlmBase)
34
    pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
35
endif (PKG_CONFIG_FOUND)
36
30
# List of likely places to find the headers -- note priority override of
37
# List of likely places to find the headers -- note priority override of
31
# OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include.
38
# OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include.
32
# ILMBASE is needed in case ilmbase an openexr are installed in separate
39
# ILMBASE is needed in case ilmbase an openexr are installed in separate
Lines 35-40 Link Here
35
    ${OPENEXR_CUSTOM_INCLUDE_DIR}
42
    ${OPENEXR_CUSTOM_INCLUDE_DIR}
36
    ${OPENEXR_HOME}/include
43
    ${OPENEXR_HOME}/include
37
    ${ILMBASE_HOME}/include
44
    ${ILMBASE_HOME}/include
45
    ${_ILMBASE_INCLUDEDIR}
46
    ${_OPENEXR_INCLUDEDIR}
38
    /usr/local/include
47
    /usr/local/include
39
    /usr/include
48
    /usr/include
40
    /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
49
    /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
Lines 53-59 Link Here
53
find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
62
find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
54
63
55
# Try to figure out version number
64
# Try to figure out version number
56
if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
65
if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
66
    set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
67
    string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
68
    string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
69
elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
57
    # Must be at least 2.0
70
    # Must be at least 2.0
58
    file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
71
    file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
59
    string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
72
    string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
Lines 90-95 Link Here
90
    ${GENERIC_LIBRARY_PATHS}
103
    ${GENERIC_LIBRARY_PATHS}
91
    ${OPENEXR_INCLUDE_PATH}/../lib
104
    ${OPENEXR_INCLUDE_PATH}/../lib
92
    ${ILMBASE_INCLUDE_PATH}/../lib
105
    ${ILMBASE_INCLUDE_PATH}/../lib
106
    ${_ILMBASE_LIBDIR}
107
    ${_OPENEXR_LIBDIR}
93
    /usr/local/lib
108
    /usr/local/lib
94
    /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
109
    /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
95
    /usr/lib
110
    /usr/lib

Return to bug 683126