diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:18:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:20:52 +0300 |
commit | 5498e7f193e2399b8693ef17803f864103307b4b (patch) | |
tree | c72b53e0d0f3fe1e5f4706c207917a7cbcaa18d7 /intern | |
parent | 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 (diff) |
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
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/CMakeLists.txt | 12 | ||||
-rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 7 | ||||
-rw-r--r-- | intern/cycles/bvh/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/device/CMakeLists.txt | 10 | ||||
-rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 3 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/render/CMakeLists.txt | 7 | ||||
-rw-r--r-- | intern/ghost/CMakeLists.txt | 7 | ||||
-rw-r--r-- | intern/libmv/CMakeLists.txt | 3 | ||||
-rwxr-xr-x | intern/libmv/bundle.sh | 3 |
10 files changed, 52 insertions, 4 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 6b828b204f1..21657d6f3c0 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -41,6 +41,12 @@ endif() set(LIB ) +if(NOT WITH_SYSTEM_AUDASPACE) + list(APPEND LIB + audaspace + ) +endif() + if(WITH_PYTHON) list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS} @@ -49,6 +55,12 @@ if(WITH_PYTHON) intern/AUD_PyInit.cpp intern/AUD_PyInit.h ) + if(NOT WITH_SYSTEM_AUDASPACE) + list(APPEND LIB + audaspace-py + ) + endif() + add_definitions(-DWITH_PYTHON) endif() diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 3f8868d793b..ccbe20b28a8 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -39,6 +39,13 @@ set(SRC ) set(LIB + cycles_bvh + cycles_device + cycles_graph + cycles_kernel + cycles_render + cycles_subd + cycles_util ) set(ADDON_FILES diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt index 52f4138432b..ea31838d816 100644 --- a/intern/cycles/bvh/CMakeLists.txt +++ b/intern/cycles/bvh/CMakeLists.txt @@ -36,7 +36,7 @@ set(SRC_HEADERS ) set(LIB - + cycles_render ) include_directories(${INC}) diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index f0f0390c29b..d804a07bcab 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -62,6 +62,16 @@ set(LIB ) +if(WITH_CUDA_DYNLOAD) + list(APPEND LIB + extern_cuew + ) +else() + list(APPEND LIB + ${CUDA_CUDA_LIBRARY} + ) +endif() + add_definitions(${GL_DEFINITIONS}) if(WITH_CYCLES_NETWORK) add_definitions(-DWITH_NETWORK) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index cbb69962781..01552dff9bb 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -474,6 +474,9 @@ endif() # OSL module if(WITH_CYCLES_OSL) + list(APPEND LIB + cycles_kernel_osl + ) add_subdirectory(osl) add_subdirectory(shaders) endif() diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt index 804610bdc10..0a3d0b974cb 100644 --- a/intern/cycles/kernel/osl/CMakeLists.txt +++ b/intern/cycles/kernel/osl/CMakeLists.txt @@ -26,7 +26,7 @@ set(HEADER_SRC ) set(LIB - + cycles_render ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}") diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index af0f8b806a8..140fcb206dc 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -74,8 +74,15 @@ set(SRC_HEADERS ) set(LIB + cycles_bvh ) +if(WITH_CYCLES_OSL) + list(APPEND LIB + cycles_kernel_osl + ) +endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}") include_directories(${INC}) diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index eeec5ab1528..a43906cea85 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -85,6 +85,9 @@ set(SRC ) set(LIB + bf_intern_glew_mx + bf_intern_string + ${GLEW_LIBRARY} ) if(WITH_GHOST_DEBUG) @@ -195,6 +198,10 @@ elseif(WITH_X11) if(WITH_GHOST_XDND) add_definitions(-DWITH_XDND) + list(APPEND LIB + extern_xdnd + ) + list(APPEND INC ../../extern/xdnd ) diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index 91e638c9c45..b2193ae7320 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -34,7 +34,8 @@ set(SRC ) set(LIB - + extern_ceres + extern_glog ) if(WITH_LIBMV) diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh index 27fc0e886a1..ca7f22a1e5a 100755 --- a/intern/libmv/bundle.sh +++ b/intern/libmv/bundle.sh @@ -113,7 +113,8 @@ set(SRC ) set(LIB - + extern_ceres + extern_glog ) if(WITH_LIBMV) |