diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt index b84d3e6..524a59e 100644 --- a/openvdb/CMakeLists.txt +++ b/openvdb/CMakeLists.txt @@ -71,13 +71,13 @@ message(STATUS "----------------------------------------------------") # Collect and configure lib dependencies if(USE_EXR) - find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED) - find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED) + find_package(IlmBase REQUIRED) + find_package(OpenEXR REQUIRED) else() - find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) + find_package(IlmBase REQUIRED COMPONENTS Half) endif() -find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) +find_package(TBB CONFIG REQUIRED) find_package(ZLIB ${MINIMUM_ZLIB_VERSION} REQUIRED) if(USE_LOG4CPLUS) @@ -115,15 +115,15 @@ endif() set(OPENVDB_CORE_DEPENDENT_LIBS Boost::iostreams Boost::system - IlmBase::Half + ${Ilmbase_HALF_LIBRARY} ) if(USE_EXR) list(APPEND OPENVDB_CORE_DEPENDENT_LIBS - IlmBase::IlmThread - IlmBase::Iex - IlmBase::Imath - OpenEXR::IlmImf + ${Ilmbase_ILMTHREAD_LIBRARY} + ${Ilmbase_IEX_LIBRARY} + ${Ilmbase_IMATH_LIBRARY} + ${OPENEXR_ILMIMF_LIBRARY} ) endif() @@ -135,7 +135,7 @@ endif() # See FindOpenVDB.cmake if(USE_BLOSC) - list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) + list(APPEND OPENVDB_CORE_DEPENDENT_LIBS ${BLOSC_blosc_LIBRARY}) endif() list(APPEND OPENVDB_CORE_DEPENDENT_LIBS @@ -160,7 +160,11 @@ endif() # @todo Should be target definitions if(WIN32) - add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL) + add_definitions(-D_WIN32 -DNOMINMAX) + add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE -D__TBBMALLOC_NO_IMPLICIT_LINKAGE) + if (OPENVDB_SHARED) + add_definitions(-DOPENEXR_DLL -DOPENVDB_DLL) + endif() endif() ##### Core library configuration @@ -374,6 +378,7 @@ list(APPEND OPENVDB_CORE_PRIVATE_DEFINES "-DOPENVDB_PRIVATE") if(USE_BLOSC) list(APPEND OPENVDB_CORE_PRIVATE_DEFINES "-DOPENVDB_USE_BLOSC") endif() +list(APPEND OPENVDB_CORE_PRIVATE_DEFINES "$<$:/bigobj>") # Public defines diff --git a/openvdb/cmd/CMakeLists.txt b/openvdb/cmd/CMakeLists.txt index 124bc3c..d58b3fe 100644 --- a/openvdb/cmd/CMakeLists.txt +++ b/openvdb/cmd/CMakeLists.txt @@ -155,9 +155,9 @@ if(OPENVDB_BUILD_VDB_RENDER) # headers target_link_libraries(vdb_render - OpenEXR::IlmImf - IlmBase::IlmThread - IlmBase::Iex + ${OPENEXR_ILMIMF_LIBRARY} + ${Ilmbase_ILMTHREAD_LIBRARY} + ${Ilmbase_IEX_LIBRARY} ${OPENVDB_BINARIES_DEPENDENT_LIBS} )