From 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2019 06:11:27 +0200 Subject: CMake: cleanup, arg rename, add definitions last --- source/blender/modifiers/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/modifiers/CMakeLists.txt') diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 4873e08bb05..8cf6382608d 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -119,10 +119,10 @@ if(WITH_ALEMBIC) endif() if(WITH_MOD_REMESH) - add_definitions(-DWITH_MOD_REMESH) list(APPEND INC ../../../intern/dualcon ) + add_definitions(-DWITH_MOD_REMESH) endif() if(WITH_MOD_FLUID) -- cgit v1.2.3 From 5498e7f193e2399b8693ef17803f864103307b4b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2019 06:18:52 +0200 Subject: CMake: add library deps to CMakeLists.txt Tested to work on Linux and macOS. This will be enabled once all platforms are verified. See D4684 --- source/blender/modifiers/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source/blender/modifiers/CMakeLists.txt') diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 8cf6382608d..33bdd900556 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -109,6 +109,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_ALEMBIC) @@ -116,12 +118,18 @@ if(WITH_ALEMBIC) list(APPEND INC ../alembic ) + list(APPEND LIB + bf_alembic + ) endif() if(WITH_MOD_REMESH) list(APPEND INC ../../../intern/dualcon ) + list(APPEND LIB + bf_intern_dualcon + ) add_definitions(-DWITH_MOD_REMESH) endif() @@ -134,6 +142,9 @@ if(WITH_MOD_OCEANSIM) endif() if(WITH_BULLET) + list(APPEND LIB + extern_bullet + ) add_definitions(-DWITH_BULLET) endif() -- cgit v1.2.3