kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CMake: Remove hardcoded DIR_ROOT for alembic and MinGW

Browse Source 
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.
This commit is contained in:
Sergey Sharybin 2016-08-09 12:35:00 +02:00
parent f0bf33fd1b
commit 62b670633c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -1990,14 +1990,16 @@ elseif(WIN32)
endif() endif()
if(WITH_ALEMBIC) 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) find_package_wrapper(Alembic)
if(WITH_ALEMBIC_HDF5) if(WITH_ALEMBIC_HDF5)
set(HDF5_ROOT_DIR ${LIBDIR}/hdf5) set(HDF5_ROOT_DIR ${LIBDIR}/hdf5)
find_package_wrapper(HDF5) find_package_wrapper(HDF5)
endif() endif()
if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT HDF5_FOUND)) if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT HDF5_FOUND))
set(WITH_ALEMBIC OFF) set(WITH_ALEMBIC OFF)
set(WITH_ALEMBIC_HDF5 OFF) set(WITH_ALEMBIC_HDF5 OFF)