[Bf-blender-cvs] [bb6b7dd4ade] master: CMake: re-order openvdb/osl linking

Brecht Van Lommel noreply at git.blender.org
Tue Apr 16 06:21:47 CEST 2019


Commit: bb6b7dd4adebcdacfeabdaf26daa5e0d49079f67
Author: Brecht Van Lommel
Date:   Tue Apr 16 06:09:34 2019 +0200
Branches: master
https://developer.blender.org/rBbb6b7dd4adebcdacfeabdaf26daa5e0d49079f67

CMake: re-order openvdb/osl linking

Needed for building without sorted libs.

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

M	build_files/cmake/macros.cmake

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 3947f087105..c0340427d95 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()



More information about the Bf-blender-cvs mailing list