diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2016-02-10 15:59:04 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2016-02-10 15:59:04 +0300 |
| commit | 4a7b09c4eace9a8affb73d525f64704a13c506f4 (patch) | |
| tree | 42e2a7f42d7fb9740776b9d3c6a57b86862d94b2 /CMakeLists.txt | |
| parent | e7374d0227348b461e4d55d8f36536174d84e24e (diff) | |
Windows MSVC allow building with openvdb / tbb
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d2d87270fd0..4e623d587bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1423,7 +1423,7 @@ elseif(WIN32) message(WARNING "Using HARDCODED OpenEXR locations") set(OPENEXR ${LIBDIR}/openexr) set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include) - set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR) + set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR) set(OPENEXR_LIBPATH ${OPENEXR}/lib) set(OPENEXR_LIBRARIES ${OPENEXR_LIBPATH}/Iex-2_2.lib @@ -1476,6 +1476,9 @@ elseif(WIN32) if(WITH_INTERNATIONAL) list(APPEND boost_extra_libs locale) endif() + if(WITH_OPENVDB) + list(APPEND boost_extra_libs iostreams) + endif() set(Boost_USE_STATIC_RUNTIME ON) # prefix lib set(Boost_USE_MULTITHREADED ON) # suffix -mt set(Boost_USE_STATIC_LIBS ON) # suffix -s @@ -1566,11 +1569,12 @@ elseif(WIN32) endif() if(WITH_OPENVDB) + set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/tbb.lib) + set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include) set(OPENVDB ${LIBDIR}/openvdb) - set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include) + set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR}) set(OPENVDB_LIBRARIES openvdb ${TBB_LIBRARIES}) set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib) - set(OPENVDB_DEFINITIONS) endif() if(WITH_MOD_CLOTH_ELTOPO) |