[Bf-blender-cvs] [201f43e] alembic_pointcache: Fix for Alembic find script to link all the necessary allembic libs.

Lukas Tönne noreply at git.blender.org
Thu Oct 16 16:52:33 CEST 2014


Commit: 201f43e2ff61b029fc71b60727445113cd1faeb0
Author: Lukas Tönne
Date:   Wed Oct 2 15:32:25 2013 +0200
Branches: alembic_pointcache
https://developer.blender.org/rB201f43e2ff61b029fc71b60727445113cd1faeb0

Fix for Alembic find script to link all the necessary allembic libs.

===================================================================

M	build_files/cmake/Modules/FindAlembic.cmake

===================================================================

diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake
index 343ea83..8732e13 100644
--- a/build_files/cmake/Modules/FindAlembic.cmake
+++ b/build_files/cmake/Modules/FindAlembic.cmake
@@ -36,7 +36,15 @@ SET(_alembic_SEARCH_DIRS
   /opt/lib/alembic
 )
 
-FIND_PATH(ALEMBIC_INCLUDE_DIR
+SET(_alembic_FIND_COMPONENTS
+  AlembicAbc
+  AlembicAbcCoreAbstract
+  AlembicAbcGeom
+  AlembicAbcCoreHDF5
+  AlembicUtil
+)
+
+FIND_PATH(_alembic_INCLUDE_DIRS
   NAMES
     Alembic/Abc/All.h
   HINTS
@@ -45,27 +53,34 @@ FIND_PATH(ALEMBIC_INCLUDE_DIR
     include
 )
 
-FIND_LIBRARY(ALEMBIC_LIBRARY
-  NAMES
-    AlembicAbc AlembicAbcCoreAbstract
-  HINTS
-    ${_alembic_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib/static
-  )
+SET(_alembic_LIBRARIES)
+FOREACH(COMPONENT ${_alembic_FIND_COMPONENTS})
+  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+  FIND_LIBRARY(ALEMBIC_${UPPERCOMPONENT}_LIBRARY
+    NAMES
+      ${COMPONENT}
+    HINTS
+      ${_alembic_SEARCH_DIRS}
+    PATH_SUFFIXES
+      lib/static
+    )
+  MARK_AS_ADVANCED(ALEMBIC_${UPPERCOMPONENT}_LIBRARY)
+  LIST(APPEND _alembic_LIBRARIES "${ALEMBIC_${UPPERCOMPONENT}_LIBRARY}")
+ENDFOREACH()
 
-# handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Alembic DEFAULT_MSG
-    ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR)
+    _alembic_LIBRARIES _alembic_INCLUDE_DIRS)
 
 IF(ALEMBIC_FOUND)
-  SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY})
-  SET(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
+  SET(ALEMBIC_LIBRARIES ${_alembic_LIBRARIES})
+  SET(ALEMBIC_INCLUDE_DIRS ${_alembic_INCLUDE_DIRS})
 ENDIF(ALEMBIC_FOUND)
 
 MARK_AS_ADVANCED(
-  ALEMBIC_INCLUDE_DIR
-  ALEMBIC_LIBRARY
+  ALEMBIC_INCLUDE_DIRS
+  ALEMBIC_LIBRARIES
 )




More information about the Bf-blender-cvs mailing list