Revision: 39690
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39690
Author: blendix
Date: 2011-08-25 12:50:52 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
Cycles: fix linux build issue, link order was wrong.
Modified Paths:
--------------
branches/cycles/build_files/cmake/macros.cmake
branches/cycles/intern/cycles/blender/CMakeLists.txt
branches/cycles/source/creator/CMakeLists.txt
Modified: branches/cycles/build_files/cmake/macros.cmake
===================================================================
--- branches/cycles/build_files/cmake/macros.cmake 2011-08-25 09:41:36 UTC
(rev 39689)
+++ branches/cycles/build_files/cmake/macros.cmake 2011-08-25 12:50:52 UTC
(rev 39690)
@@ -282,12 +282,7 @@
target_link_libraries(${target} ${OPENIMAGEIO_LIBRARY})
endif()
if(WITH_BOOST)
- if(BOOST_CUSTOM)
- set(${boost_libs} ${BOOST_LIBRARIES})
- target_link_libraries(${target} ${boost_libs})
- else()
- target_link_libraries(${target} ${BOOST_LIBRARIES})
- endif()
+ target_link_libraries(${target} ${BOOST_LIBRARIES})
endif()
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX)
Modified: branches/cycles/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/blender/CMakeLists.txt 2011-08-25
09:41:36 UTC (rev 39689)
+++ branches/cycles/intern/cycles/blender/CMakeLists.txt 2011-08-25
12:50:52 UTC (rev 39690)
@@ -31,30 +31,8 @@
${PYTHON_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH})
-set(LIBRARIES
- cycles_render
- cycles_bvh
- cycles_device
- cycles_kernel
- cycles_util
- cycles_subd)
-
-if(WITH_CYCLES_OSL)
- list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
-endif()
-
-if(WITH_CYCLES_PARTIO)
- list(APPEND LIBRARIES ${PARTIO_LIBRARIES})
-endif()
-
-if(WITH_CYCLES_OPENCL)
- list(APPEND LIBRARIES ${OPENCL_LIBRARIES})
-endif()
-
blender_add_lib(bf_intern_cycles "${sources}" "" "")
-
add_dependencies(bf_intern_cycles bf_rna)
-target_link_libraries(bf_intern_cycles ${LIBRARIES})
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${addonfiles}"
${CYCLES_INSTALL_PATH})
Modified: branches/cycles/source/creator/CMakeLists.txt
===================================================================
--- branches/cycles/source/creator/CMakeLists.txt 2011-08-25 09:41:36 UTC
(rev 39689)
+++ branches/cycles/source/creator/CMakeLists.txt 2011-08-25 12:50:52 UTC
(rev 39690)
@@ -729,7 +729,17 @@
list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
endif()
+if(WITH_CYCLES)
+ list(APPEND BLENDER_LINK_LIBS
+ cycles_render
+ cycles_bvh
+ cycles_device
+ cycles_kernel
+ cycles_util
+ cycles_subd)
+endif()
+
#if(UNIX)
# Sort libraries
set(BLENDER_SORTED_LIBS
@@ -830,6 +840,14 @@
bf_blenfont
bf_intern_audaspace
bf_intern_mikktspace
+
+ bf_intern_cycles
+ cycles_render
+ cycles_bvh
+ cycles_device
+ cycles_kernel
+ cycles_util
+ cycles_subd
)
if(WITH_MOD_CLOTH_ELTOPO)
@@ -856,10 +874,6 @@
list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
endif()
- if(WITH_CYCLES)
- list(APPEND BLENDER_SORTED_LIBS bf_intern_cycles)
- endif()
-
foreach(SORTLIB ${BLENDER_SORTED_LIBS})
set(REMLIB ${SORTLIB})
foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
