[Bf-blender-cvs] [f990518] master: CMake: Once again, don't use find_package to get hardcoded libraries

Sergey Sharybin noreply at git.blender.org
Tue Aug 9 12:58:08 CEST 2016


Commit: f990518041cf7fbfd2534f9ee3daf13f8bc509b4
Author: Sergey Sharybin
Date:   Tue Aug 9 12:37:25 2016 +0200
Branches: master
https://developer.blender.org/rBf990518041cf7fbfd2534f9ee3daf13f8bc509b4

CMake: Once again, don't use find_package to get hardcoded libraries

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d32c5ad..281aa52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2091,17 +2091,11 @@ elseif(APPLE)
 	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()
+		set(ALEMBIC ${LIBDIR}/alembic)
+		set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
+		set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
+		set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
+		set(ALEMBIC_LIBRARIES Alembic)
 	endif()
 
 	if(WITH_OPENSUBDIV)




More information about the Bf-blender-cvs mailing list