[Bf-blender-cvs] [1e03976] alembic_basic_io: Fix OSX alembic lookup

Jens Verwiebe noreply at git.blender.org
Sun Jul 3 21:54:29 CEST 2016


Commit: 1e0397645b1e3425663ac5b37e69890cc5d065a4
Author: Jens Verwiebe
Date:   Sun Jul 3 21:52:35 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB1e0397645b1e3425663ac5b37e69890cc5d065a4

Fix OSX alembic lookup

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 874ed17..918b965 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,7 @@ option(WITH_ALEMBIC             "Enable Alembic Support" OFF)
 option(WITH_ALEMBIC_HDF5        "Enable Legacy Alembic Support" OFF)
 
 # alembic
-if(WITH_ALEMBIC)
+if(WITH_ALEMBIC AND NOT APPLE) # LIBDIR not yet set, so cannot set root dirs for lookup !
 	find_package(Alembic)
 
 	if(WITH_ALEMBIC_HDF5)
@@ -2062,6 +2062,20 @@ elseif(APPLE)
 		endif()
 	endif()
 
+	if(WITH_ALEMBIC)
+		set(ALEMBIC_ROOT_DIR ${LIBDIR}/alembic)
+		find_package(Alembic)
+		if(WITH_ALEMBIC_HDF5)
+			set(HDF5_ROOT_DIR ${LIBDIR}/hdf5)
+			find_package(HDF5)
+		endif()
+
+		if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT HDF5_FOUND))
+			set(WITH_ALEMBIC OFF)
+			set(WITH_ALEMBIC_HDF5 OFF)
+		endif()
+	endif()
+
 	if(WITH_OPENSUBDIV)
 		set(OPENSUBDIV ${LIBDIR}/opensubdiv)
 		set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)




More information about the Bf-blender-cvs mailing list