From d48e4fc92be346810baa8cac595ab0a735882a87 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Thu, 25 Aug 2011 12:50:52 +0000
Subject: Cycles: fix linux build issue, link order was wrong.

---
 build_files/cmake/macros.cmake       |  7 +------
 intern/cycles/blender/CMakeLists.txt | 22 ----------------------
 source/creator/CMakeLists.txt        | 22 ++++++++++++++++++----
 3 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index ab63c6f51a7..15198b2f67d 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -282,12 +282,7 @@ macro(setup_liblinks
 		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)
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 324d35d5360..a035d8fde6b 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -31,30 +31,8 @@ include_directories(
 	${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})
 
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 9e9a1ef7db1..0c5f15c130b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -729,6 +729,16 @@ if(WITH_MOD_FLUID)
 	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
@@ -830,6 +840,14 @@ endif()
 		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 @@ endif()
 		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})
-- 
cgit v1.2.3