diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2016-03-30 16:15:07 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2016-03-30 16:15:17 +0300 |
| commit | 74d3f3746c644546f583587fc8d38f9538a0595f (patch) | |
| tree | bd5acb946bc878016c50b0a934a879525f8d4c92 /intern/cycles/app | |
| parent | 119ce13a41d5c97debc431662e954c90e4bb3a59 (diff) | |
CMake cleanup target_link_libraries_decoupled
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index af20356ad77..d40a1a14f72 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -84,18 +84,12 @@ include_directories(SYSTEM ${INC_SYS}) macro(cycles_target_link_libraries target) target_link_libraries(${target} ${LIBRARIES}) if(WITH_CYCLES_OSL) - target_link_libraries_decoupled(${target} OSL_LIBRARIES) - if(MSVC) - target_link_libraries_debug(${target} "${LLVM_LIBRARIES_DEBUG}") - target_link_libraries_optimized(${target} "${LLVM_LIBRARIES}") - else() - target_link_libraries(${target} ${LLVM_LIBRARIES}) - endif() + target_link_libraries(${target} ${OSL_LIBRARIES} ${LLVM_LIBRARIES}) endif() - target_link_libraries_decoupled(${target} OPENIMAGEIO_LIBRARIES) - target_link_libraries_decoupled(${target} OPENEXR_LIBRARIES) target_link_libraries( ${target} + ${OPENIMAGEIO_LIBRARIES} + ${OPENEXR_LIBRARIES} ${PUGIXML_LIBRARIES} ${BOOST_LIBRARIES} ${CMAKE_DL_LIBS} |