diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-10 10:18:20 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-10 10:18:20 +0400 |
| commit | 1352a955ca61b20d071d064d88f981711f80dd1d (patch) | |
| tree | 1ef07c261158eb4cf9064ff6d6bf19a7b5115305 /build_files/cmake/macros.cmake | |
| parent | 12c71a8c6866e345373127e976f55cb15aa73ded (diff) | |
Cleanup for OSL linking in cmake: Move cmake OSL library search and path definition from the cycles macro file to the top-level CMakeLists.txt. This makes the OSL_LIBRARIES and other variables accessible throughout Blender cmake scripts and especially in the creator module for linking libraries.
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 62e1e83326c..97ce84142e9 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -367,6 +367,9 @@ macro(setup_liblinks if(WITH_MOD_CLOTH_ELTOPO) target_link_libraries(${target} ${LAPACK_LIBRARIES}) endif() + if(WITH_CYCLES_OSL) + target_link_libraries(${target} ${OSL_LIBRARIES}) + endif() if(WIN32 AND NOT UNIX) target_link_libraries(${target} ${PTHREADS_LIBRARIES}) endif() |