diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-02-26 17:11:24 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-26 20:13:14 +0300 |
commit | 78391def6e41f994e9089b346332c909b9ccc58a (patch) | |
tree | 215e930cef52539bb845051c90059f40f24545ba /intern | |
parent | 22abc7f0808835d88ea244a1129ae4e98d87dc3b (diff) |
Cleanup: deduplicate OpenVDB library definitions/include/libs logic
This will more important when we start using OpenVDB in more modules.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/mantaflow/CMakeLists.txt | 12 | ||||
-rw-r--r-- | intern/openvdb/CMakeLists.txt | 38 |
2 files changed, 1 insertions, 49 deletions
diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt index d9b64b3a199..1ca523ccc44 100644 --- a/intern/mantaflow/CMakeLists.txt +++ b/intern/mantaflow/CMakeLists.txt @@ -27,7 +27,6 @@ add_definitions(-DWITH_FLUID=1) if(WITH_OPENVDB) add_definitions(-DOPENVDB=1) - add_definitions(-DOPENVDB_STATICLIB) else() add_definitions(-DOPENVDB=0) endif() @@ -66,22 +65,11 @@ endif() if(WITH_OPENVDB) list(APPEND INC_SYS - ${BOOST_INCLUDE_DIR} - ${OPENEXR_INCLUDE_DIRS} ${OPENVDB_INCLUDE_DIRS} ) list(APPEND LIB ${OPENVDB_LIBRARIES} - ${OPENEXR_LIBRARIES} - ${ZLIB_LIBRARIES} - ${BOOST_LIBRARIES} ) - if(WITH_OPENVDB_BLOSC) - list(APPEND LIB - ${BLOSC_LIBRARIES} - ${ZLIB_LIBRARIES} - ) - endif() endif() set(SRC diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt index a681d723b9c..2b7517a255c 100644 --- a/intern/openvdb/CMakeLists.txt +++ b/intern/openvdb/CMakeLists.txt @@ -35,28 +35,9 @@ set(LIB ) if(WITH_OPENVDB) - add_definitions( - -DWITH_OPENVDB - ${OPENVDB_DEFINITIONS} - ) - - if(WIN32) - add_definitions( - -DOPENVDB_STATICLIB - -D_USE_MATH_DEFINES - ) - endif() - - if(WITH_OPENVDB_3_ABI_COMPATIBLE) - add_definitions( - -DOPENVDB_3_ABI_COMPATIBLE - ) - endif() + add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS}) list(APPEND INC_SYS - ${BOOST_INCLUDE_DIR} - ${TBB_INCLUDE_DIRS} - ${OPENEXR_INCLUDE_DIRS} ${OPENVDB_INCLUDE_DIRS} ) @@ -79,23 +60,6 @@ if(WITH_OPENVDB) list(APPEND LIB ${OPENVDB_LIBRARIES} - ${OPENEXR_LIBRARIES} - ${ZLIB_LIBRARIES} - ) - - if(WITH_OPENVDB_BLOSC) - add_definitions( - -DWITH_OPENVDB_BLOSC - ) - list(APPEND LIB - ${BLOSC_LIBRARIES} - ${ZLIB_LIBRARIES} - ) - endif() - - list(APPEND LIB - ${BOOST_LIBRARIES} - ${TBB_LIBRARIES} ) endif() |