[Bf-blender-cvs] [e662ea575c0] temp-cmake-without-sorted-libs: CMake: fixes for sorted libs.

[Brecht Van Lommel]

Commit: e662ea575c0b4c2fa4122852a37e8864049b3f7f
Author: Brecht Van Lommel
Date:   Mon Apr 15 20:13:24 2019 +0200
Branches: temp-cmake-without-sorted-libs
https://developer.blender.org/rBe662ea575c0b4c2fa4122852a37e8864049b3f7f

CMake: fixes for sorted libs.

===================================================================

M	build_files/cmake/macros.cmake
M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/render/CMakeLists.txt
M	intern/ghost/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blentranslation/CMakeLists.txt
M	source/blender/gpu/CMakeLists.txt
M	source/blender/ikplugin/CMakeLists.txt

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 5dde5aca9f9..86ddc21bc97 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -427,8 +427,11 @@ function(setup_liblinks
 	if(WITH_SDL AND NOT WITH_SDL_DYNLOAD)
 		target_link_libraries(${target} ${SDL_LIBRARY})
 	endif()
-	if(WITH_IMAGE_TIFF)
-		target_link_libraries(${target} ${TIFF_LIBRARY})
+	if(WITH_CYCLES_OSL)
+		target_link_libraries(${target} ${OSL_LIBRARIES})
+	endif()
+	if(WITH_OPENVDB)
+		target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
 	endif()
 	if(WITH_OPENIMAGEIO)
 		target_link_libraries(${target} ${OPENIMAGEIO_LIBRARIES})
@@ -439,12 +442,6 @@ function(setup_liblinks
 	if(WITH_OPENSUBDIV)
 			target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
 	endif()
-	if(WITH_OPENVDB)
-		target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
-	endif()
-	if(WITH_CYCLES_OSL)
-		target_link_libraries(${target} ${OSL_LIBRARIES})
-	endif()
 	if(WITH_CYCLES_EMBREE)
 		target_link_libraries(${target} ${EMBREE_LIBRARIES})
 	endif()
@@ -458,6 +455,9 @@ function(setup_liblinks
 	if(WITH_ALEMBIC)
 		target_link_libraries(${target} ${ALEMBIC_LIBRARIES} ${HDF5_LIBRARIES})
 	endif()
+	if(WITH_IMAGE_TIFF)
+		target_link_libraries(${target} ${TIFF_LIBRARY})
+	endif()
 	if(WITH_IMAGE_OPENEXR)
 		target_link_libraries(${target} ${OPENEXR_LIBRARIES})
 	endif()
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index cbb69962781..01552dff9bb 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -474,6 +474,9 @@ endif()
 # OSL module
 
 if(WITH_CYCLES_OSL)
+	list(APPEND LIB
+		cycles_kernel_osl
+	)
 	add_subdirectory(osl)
 	add_subdirectory(shaders)
 endif()
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index 6a02463d651..140fcb206dc 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -77,6 +77,12 @@ set(LIB
 	cycles_bvh
 )
 
+if(WITH_CYCLES_OSL)
+	list(APPEND LIB
+		cycles_kernel_osl
+	)
+endif()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
 
 include_directories(${INC})
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index ace05370594..a43906cea85 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -198,6 +198,10 @@ elseif(WITH_X11)
 	if(WITH_GHOST_XDND)
 		add_definitions(-DWITH_XDND)
 
+		list(APPEND LIB
+			extern_xdnd
+		)
+
 		list(APPEND INC
 			../../extern/xdnd
 		)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 757204fd2b6..696d252c81d 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -598,6 +598,9 @@ if(WITH_OPENVDB)
 	list(APPEND INC
 		 ../../../intern/openvdb
 	)
+	list(APPEND LIB
+		 bf_intern_openvdb
+	)
 	add_definitions(-DWITH_OPENVDB)
 
 	if(WITH_OPENVDB_BLOSC)
diff --git a/source/blender/blentranslation/CMakeLists.txt b/source/blender/blentranslation/CMakeLists.txt
index 47543ade807..5bb35d79373 100644
--- a/source/blender/blentranslation/CMakeLists.txt
+++ b/source/blender/blentranslation/CMakeLists.txt
@@ -42,11 +42,13 @@ set(SRC
 set(LIB
 	bf_blenkernel
 	bf_blenlib
-	bf_intern_locale
 )
 
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
+	list(APPEND LIB
+		bf_intern_locale
+	)
 endif()
 
 if(WITH_PYTHON)
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 430eefe6fc7..d7a03280894 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -124,6 +124,7 @@ set(SRC
 )
 
 set(LIB
+	extern_glew
 )
 
 data_to_c_simple(shaders/gpu_shader_depth_only_frag.glsl SRC)
diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index 9bbc3a62b99..b3444968f78 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -44,6 +44,9 @@ set(LIB
 
 if(WITH_IK_SOLVER)
 	add_definitions(-DWITH_IK_SOLVER)
+	list(APPEND LIB
+		bf_intern_iksolver
+	)
 	list(APPEND INC
 		../../../intern/iksolver/extern
 	)
@@ -55,6 +58,9 @@ endif()
 
 if(WITH_IK_ITASC)
 	add_definitions(-DWITH_IK_ITASC)
+	list(APPEND LIB
+		bf_intern_itasc
+	)
 	list(APPEND INC
 		../../../intern/itasc
 	)