51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake
|
|
index cd00d70..0e50512 100644
|
|
--- a/cmake/AlembicIlmBase.cmake
|
|
+++ b/cmake/AlembicIlmBase.cmake
|
|
@@ -33,11 +33,17 @@
|
|
##
|
|
##-*****************************************************************************
|
|
|
|
-FIND_PACKAGE(IlmBase)
|
|
+FIND_PACKAGE(OpenEXR)
|
|
|
|
-IF (ILMBASE_FOUND)
|
|
+IF (OPENEXR_FOUND)
|
|
SET(ALEMBIC_ILMBASE_FOUND 1 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise")
|
|
|
|
+ set(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${OpenEXR_INCLUDE_DIRS}/OpenEXR)
|
|
+ set(ALEMBIC_ILMBASE_HALF_LIB ${OPENEXR_HALF_LIBRARY})
|
|
+ set(ALEMBIC_ILMBASE_IEX_LIB ${OPENEXR_IEX_LIBRARY})
|
|
+ set(ALEMBIC_ILMBASE_IEXMATH_LIB ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IMATH_LIBRARY})
|
|
+ set(ALEMBIC_ILMBASE_ILMTHREAD_LIB ${OPENEXR_ILMTHREAD_LIBRARY})
|
|
+ set(ALEMBIC_ILMBASE_IMATH_LIB ${OPENEXR_IMATH_LIBRARY})
|
|
SET(ALEMBIC_ILMBASE_LIBS
|
|
${ALEMBIC_ILMBASE_IMATH_LIB}
|
|
${ALEMBIC_ILMBASE_ILMTHREAD_LIB}
|
|
@@ -45,9 +59,9 @@ IF (ILMBASE_FOUND)
|
|
${ALEMBIC_ILMBASE_HALF_LIB}
|
|
)
|
|
|
|
- if (${ALEMBIC_ILMBASE_IEXMATH_LIB})
|
|
+ if (ALEMBIC_ILMBASE_IEXMATH_LIB)
|
|
SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_LIBS} ${ALEMBIC_ILMBASE_IEXMATH_LIB})
|
|
- endif (${ALEMBIC_ILMBASE_IEXMATH_LIB})
|
|
+ endif (ALEMBIC_ILMBASE_IEXMATH_LIB)
|
|
|
|
ELSE()
|
|
SET(ALEMBIC_ILMBASE_FOUND 0 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise")
|
|
diff --git a/cmake/AlembicOpenEXR.cmake b/cmake/AlembicOpenEXR.cmake
|
|
index 0833b32..a9180cd 100644
|
|
--- a/cmake/AlembicOpenEXR.cmake
|
|
+++ b/cmake/AlembicOpenEXR.cmake
|
|
@@ -38,8 +38,8 @@
|
|
FIND_PACKAGE( OpenEXR )
|
|
|
|
IF( OPENEXR_FOUND )
|
|
- SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS} )
|
|
+ SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS}/OpenEXR )
|
|
SET( ALEMBIC_OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} )
|
|
# SET( ALEMBIC_OPENEXR_DEFINITIONS ${OPENEXR_DEFINITIONS} )
|
|
|
|
SET( ALEMBIC_OPENEXR_FOUND 1 CACHE STRING "Set to 1 if OpenEXR is found, 0 otherwise" )
|