diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-09 13:29:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-09 13:38:09 +0300 |
| commit | f0bf33fd1bd8a7fdb7554644dfa31270167b0c34 (patch) | |
| tree | 4e931cb5716493916d3c94d0a7803688dd41cf08 | |
| parent | bccaa994f11e02e095cf85dc4cb11431149ae384 (diff) | |
CMake: Use proper way to define debug/release libraries for alembic
Please do not spread platform+library specific code all over the CMake file,
we already have sections dedicated to that.
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 01ca0d014b4..c77975d3b94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1683,18 +1683,11 @@ elseif(WIN32) 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 optimized alembic debug alembic_d) endif() if(WITH_MOD_CLOTH_ELTOPO) @@ -2575,17 +2568,6 @@ else() endif() unset(_SYSTEM_BIG_ENDIAN) endif() -if(MSVC) - if(WITH_ALEMBIC) - 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 - optimized ${ALEMBIC_LIBPATH}/alembic.lib - debug ${ALEMBIC_LIBPATH}/alembic_d.lib) - endif(WITH_ALEMBIC) -endif(MSVC) if(WITH_IMAGE_OPENJPEG) if(WITH_SYSTEM_OPENJPEG) # dealt with above |