Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-02-26 17:11:24 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-02-26 20:13:14 +0300
commit78391def6e41f994e9089b346332c909b9ccc58a (patch)
tree215e930cef52539bb845051c90059f40f24545ba /intern/openvdb
parent22abc7f0808835d88ea244a1129ae4e98d87dc3b (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/openvdb')
-rw-r--r--intern/openvdb/CMakeLists.txt38
1 files changed, 1 insertions, 37 deletions
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()