diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2019-08-18 22:53:07 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2019-08-18 22:53:07 +0300 |
| commit | a97d7a829f75ae6ca80d24672ea340e0c50bfbd3 (patch) | |
| tree | 8d82548a2afd6b82b98513a63c374218df3b10b5 /build_files/cmake | |
| parent | 02a94d6a4c586232f6484c3bd2f5cf32a96d2f6a (diff) | |
Mantaflow: Addressed all issues from the review / diff
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 6 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index a094fd26042..18a0968a61c 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -482,7 +482,9 @@ function(setup_liblinks target_link_libraries(${target} ${ALEMBIC_LIBRARIES} ${HDF5_LIBRARIES}) endif() if(WITH_MOD_MANTA) - target_link_libraries(${target} ${TBB_LIBRARIES}) + if(NOT WITH_OPENMP OR NOT WITH_MANTA_OMP) + target_link_libraries(${target} ${TBB_LIBRARIES}) + endif() endif() if(WITH_IMAGE_TIFF) target_link_libraries(${target} ${TIFF_LIBRARY}) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 8a34d0d0adf..62de7eda1f9 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -404,8 +404,10 @@ if(WITH_OPENMP) endif() if(WITH_MOD_MANTA) - set(TBB_INCLUDE_DIRS ${LIBDIR}/tbb/include) - set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/libtbb.a) + if(NOT WITH_OPENMP OR NOT WITH_MANTA_OMP) + set(TBB_INCLUDE_DIRS ${LIBDIR}/tbb/include) + set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/libtbb.a) + endif() endif() set(EXETYPE MACOSX_BUNDLE) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 10feb0bc48e..34f52fdcdc0 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -547,8 +547,10 @@ if(WITH_SYSTEM_AUDASPACE) endif() if(WITH_MOD_MANTA) - set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib) - set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include) + if(NOT WITH_OPENMP OR NOT WITH_MANTA_OMP) + set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib) + set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include) + endif() endif() # used in many places so include globally, like OpenGL |