[Bf-blender-cvs] [c34e4d5] gooseberry: Alembic: expose CMake var ALEMBIC_INCLUDE_DIR

Campbell Barton noreply at git.blender.org
Thu Mar 26 11:01:23 CET 2015


Commit: c34e4d57fdc4162ad34407a6d6da64c9fda532cb
Author: Campbell Barton
Date:   Thu Mar 26 21:00:24 2015 +1100
Branches: gooseberry
https://developer.blender.org/rBc34e4d57fdc4162ad34407a6d6da64c9fda532cb

Alembic: expose CMake var ALEMBIC_INCLUDE_DIR

The include path could be cached to a stale value, with no obvious way to reset.

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

M	build_files/cmake/Modules/FindAlembic.cmake

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

diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake
index 00d9aef..8327101 100644
--- a/build_files/cmake/Modules/FindAlembic.cmake
+++ b/build_files/cmake/Modules/FindAlembic.cmake
@@ -42,7 +42,7 @@ SET(_alembic_FIND_COMPONENTS
   AlembicUtil
 )
 
-FIND_PATH(_alembic_INCLUDE_DIRS
+FIND_PATH(ALEMBIC_INCLUDE_DIR
   NAMES
     Alembic/Abc/All.h
   HINTS
@@ -71,14 +71,14 @@ ENDFOREACH()
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Alembic DEFAULT_MSG
-    _alembic_LIBRARIES _alembic_INCLUDE_DIRS)
+    _alembic_LIBRARIES ALEMBIC_INCLUDE_DIR)
 
 IF(ALEMBIC_FOUND)
   SET(ALEMBIC_LIBRARIES ${_alembic_LIBRARIES})
-  SET(ALEMBIC_INCLUDE_DIRS ${_alembic_INCLUDE_DIRS})
+  SET(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
 ENDIF(ALEMBIC_FOUND)
 
 MARK_AS_ADVANCED(
-  ALEMBIC_INCLUDE_DIRS
+  ALEMBIC_INCLUDE_DIR
   ALEMBIC_LIBRARIES
 )




More information about the Bf-blender-cvs mailing list