[Bf-blender-cvs] [8bb54e2] alembic_basic_io: Cleanup: find Alembic CMake module.

[Kévin Dietrich]

Commit: 8bb54e2ac31b8874914f92638ccc89b9e357bbee
Author: Kévin Dietrich
Date:   Thu Jun 9 09:33:45 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB8bb54e2ac31b8874914f92638ccc89b9e357bbee

Cleanup: find Alembic CMake module.

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

M	build_files/cmake/Modules/FindALEMBIC.cmake

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

diff --git a/build_files/cmake/Modules/FindALEMBIC.cmake b/build_files/cmake/Modules/FindALEMBIC.cmake
index 6504c20..36a541c 100644
--- a/build_files/cmake/Modules/FindALEMBIC.cmake
+++ b/build_files/cmake/Modules/FindALEMBIC.cmake
@@ -33,19 +33,45 @@ SET(_alembic_SEARCH_DIRS
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
+  /opt/lib/alembic
 )
 
-FIND_PATH(ALEMBIC_INCLUDE_DIR NAMES Alembic/Abc/All.h HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES include)
+SET(_alembic_FIND_COMPONENTS
+  AlembicAbc
+  AlembicAbcGeom
+  AlembicAbcCoreAbstract
+  AlembicUtil
+  AlembicAbcCoreHDF5
+  AlembicOgawa
+  AlembicAbcCoreOgawa
+  AlembicAbcMaterial
+  AlembicAbcCoreFactory
+)
+
+FIND_PATH(ALEMBIC_INCLUDE_DIR
+  NAMES
+    Alembic/Abc/All.h
+  HINTS
+    ${_alembic_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include
+)
 
-FIND_LIBRARY(ALEMBIC_ABC_LIBRARY 			NAMES AlembicAbc HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
-FIND_LIBRARY(ALEMBIC_ABCGEOM_LIBRARY 		NAMES AlembicAbcGeom HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
-FIND_LIBRARY(ALEMBIC_ABCCORE_ABC_LIBRARY 	NAMES AlembicAbcCoreAbstract HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
-FIND_LIBRARY(ALEMBIC_ABCUTIL_LIBRARY 		NAMES AlembicUtil HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
-FIND_LIBRARY(ALEMBIC_ABCCORE_HDF5_LIBRARY 	NAMES AlembicAbcCoreHDF5 HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
-FIND_LIBRARY(ALEMBIC_OGAWA_LIBRARY 	        NAMES AlembicOgawa HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
-FIND_LIBRARY(ALEMBIC_ABCOGAWA_LIBRARY 	    NAMES AlembicAbcCoreOgawa HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
-FIND_LIBRARY(ALEMBIC_ABCMATERIAL     	    NAMES AlembicAbcMaterial HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
-FIND_LIBRARY(ALEMBIC_ABCCOREFACTORY    	    NAMES AlembicAbcCoreFactory HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
+SET(_alembic_LIBRARIES)
+FOREACH(COMPONENT ${_alembic_FIND_COMPONENTS})
+  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+  FIND_LIBRARY(${UPPERCOMPONENT}_LIBRARY
+    NAMES
+      ${COMPONENT}
+    HINTS
+      ${_alembic_SEARCH_DIRS}
+    PATH_SUFFIXES
+      lib64 lib lib/static
+    )
+  MARK_AS_ADVANCED(${UPPERCOMPONENT}_LIBRARY)
+  LIST(APPEND _alembic_LIBRARIES "${${UPPERCOMPONENT}_LIBRARY}")
+ENDFOREACH()
 
 FIND_LIBRARY(HDF5_LIBRARY 					NAMES hdf5 HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
 FIND_LIBRARY(HDF5_HL_LIBRARY 				NAMES hdf5_hl HINTS ${_alembic_SEARCH_DIRS} PATH_SUFFIXES lib64 lib)
@@ -53,22 +79,10 @@ FIND_LIBRARY(HDF5_HL_LIBRARY 				NAMES hdf5_hl HINTS ${_alembic_SEARCH_DIRS} PAT
 # 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_ABC_LIBRARY ALEMBIC_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALEMBIC DEFAULT_MSG _alembic_LIBRARIES ALEMBIC_INCLUDE_DIR)
 
 IF(ALEMBIC_FOUND)
-  SET(ALEMBIC_LIBRARIES ${ALEMBIC_ABC_LIBRARY}
-  						${ALEMBIC_OGAWA_LIBRARY}
-						${ALEMBIC_ABCGEOM_LIBRARY}
-						${ALEMBIC_ABCCORE_ABC_LIBRARY}
-						${ALEMBIC_ABCCOREFACTORY}
-						${ALEMBIC_ABCUTIL_LIBRARY}
-						${ALEMBIC_ABCCORE_HDF5_LIBRARY}
-						${ALEMBIC_ABCOGAWA_LIBRARY}
-						${ALEMBIC_ABCMATERIAL}
-						${HDF5_HL_LIBRARY}
-						${HDF5_LIBRARY}
-						)
-
+  SET(ALEMBIC_LIBRARIES ${_alembic_LIBRARIES} ${HDF5_LIBRARY} ${HDF5_HL_LIBRARY})
   SET(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
 ENDIF(ALEMBIC_FOUND)
 
@@ -76,3 +90,7 @@ MARK_AS_ADVANCED(
   ALEMBIC_INCLUDE_DIR
   ALEMBIC_LIBRARY
 )
+
+UNSET(COMPONENT)
+UNSET(UPPERCOMPONENT)
+UNSET(_alembic_LIBRARIES)