Commit: 3b6b32d6a33b60255c6e40f73522a3969e5ebe04
Author: Sergey Sharybin
Date: Sun Dec 7 15:04:02 2014 +0500
Branches: master
https://developer.blender.org/rB3b6b32d6a33b60255c6e40f73522a3969e5ebe04
Cycles FTBFS: Send Boost after OIIO to the linker since the order matters
===================================================================
M intern/cycles/app/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index baa0fdd..3ba89dc 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
