Commit: 62b670633cc5e15bf556965c3760096544d3f2c4
Author: Sergey Sharybin
Date: Tue Aug 9 12:35:00 2016 +0200
Branches: master
https://developer.blender.org/rB62b670633cc5e15bf556965c3760096544d3f2c4
CMake: Remove hardcoded DIR_ROOT for alembic and MinGW
Do it for until precompiled libraries are there so we can allow
MinGW users to compile their own library and pass it via ROOT_DIR.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c77975d..d32c5ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1990,14 +1990,16 @@ elseif(WIN32)
endif()
if(WITH_ALEMBIC)
- set(ALEMBIC_ROOT_DIR ${LIBDIR}/alembic)
+ # TODO(sergey): For until someone drops by and compiles
libraries for
+ # MinGW we allow users to compile their own Alembic
library and use
+ # that via find_package(),
+ #
+ # Once precompiled libraries are there we'll use
hardcoded locations.
find_package_wrapper(Alembic)
-
if(WITH_ALEMBIC_HDF5)
set(HDF5_ROOT_DIR ${LIBDIR}/hdf5)
find_package_wrapper(HDF5)
endif()
-
if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT
HDF5_FOUND))
set(WITH_ALEMBIC OFF)
set(WITH_ALEMBIC_HDF5 OFF)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
