diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-07 13:04:02 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:08 +0300 |
| commit | 3b6b32d6a33b60255c6e40f73522a3969e5ebe04 (patch) | |
| tree | 249d1d1e51c331d66d69af815abbecaf95b5f3e4 /intern/cycles/app/CMakeLists.txt | |
| parent | 9b8942ac71cfe000b1402c5379342c2f1be2b288 (diff) | |
Cycles FTBFS: Send Boost after OIIO to the linker since the order matters
Diffstat (limited to 'intern/cycles/app/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index baa0fdde7f3..3ba89dc126e 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -19,7 +19,6 @@ set(LIBRARIES cycles_bvh cycles_subd cycles_util - ${BOOST_LIBRARIES} ${BLENDER_GL_LIBRARIES} ${CYCLES_APP_GLEW_LIBRARY} ${PNG_LIBRARIES} @@ -52,6 +51,12 @@ macro(target_link_libraries_oiio target) endif() endmacro() +macro(cycles_target_link_libraries target) + target_link_libraries(${target} ${LIBRARIES}) + target_link_libraries_oiio(${target}) + target_link_libraries(${target} ${BOOST_LIBRARIES} ${CMAKE_DL_LIBS} ${PLATFORM_LINKLIBS}) +endmacro() + if(NOT PUGIXML_LIBRARIES STREQUAL "") list(APPEND LIBRARIES ${PUGIXML_LIBRARIES}) endif() @@ -95,9 +100,7 @@ if(WITH_CYCLES_STANDALONE) cycles_xml.h ) add_executable(cycles ${SRC}) - list(APPEND LIBRARIES ${PLATFORM_LINKLIBS}) - target_link_libraries(cycles ${LIBRARIES} ${CMAKE_DL_LIBS}) - target_link_libraries_oiio(cycles) + cycles_target_link_libraries(cycles) if(UNIX AND NOT APPLE) set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib) @@ -110,8 +113,7 @@ if(WITH_CYCLES_NETWORK) cycles_server.cpp ) add_executable(cycles_server ${SRC}) - target_link_libraries(cycles_server ${LIBRARIES} ${CMAKE_DL_LIBS}) - target_link_libraries_oiio(cycles_server) + cycles_target_link_libraries(cycles_server) if(UNIX AND NOT APPLE) set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib) |