[Bf-blender-cvs] [bccaa994] master: CMake: Do not force set root folder for Alembic

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


Commit: bccaa994f11e02e095cf85dc4cb11431149ae384
Author: Sergey Sharybin
Date:   Tue Aug 9 12:27:17 2016 +0200
Branches: master
https://developer.blender.org/rBbccaa994f11e02e095cf85dc4cb11431149ae384

CMake: Do not force set root folder for Alembic

it is incorrect to set ROOT_DIR and then call find_package.

If something is expected to be in a given location use hardcoded
locations (for the precompiled libraries). Otherwise just use
find_package() and let users to set ROOT_DIT when it is required.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec3abfa..01ca0d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1102,7 +1102,6 @@ if(UNIX AND NOT APPLE)
 	endif()
 
 	if(WITH_ALEMBIC)
-		set(ALEMBIC_ROOT_DIR ${LIBDIR}/alembic)
 		find_package_wrapper(Alembic)
 
 		if(WITH_ALEMBIC_HDF5)




More information about the Bf-blender-cvs mailing list