Commit: 3e7100644861368b5ec951cf36c631e0828012f8
Author: Sergey Sharybin
Date: Tue Oct 25 10:22:03 2016 +0200
Branches: master
https://developer.blender.org/rB3e7100644861368b5ec951cf36c631e0828012f8
CMake: Followup to previous commit, try to ensure -ldl is always last
Seems CMake will rearrange and copy libraries which are passed to the linker
when some of the libraries is listed twice (for example, -lz from png libraries
and -l for blender itself). This was causing libopenimageio to be added
somewhere
at the end of linking flags without -ldl followed after which was causing
linking
issues.
===================================================================
M build_files/cmake/macros.cmake
M build_files/cmake/platform/platform_unix.cmake
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 5a67ac9..2e3a190 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -518,7 +518,8 @@ function(setup_liblinks
target_link_libraries(${target}
${BLENDER_GL_LIBRARIES})
- target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
+ #target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
+ target_link_libraries(${target} ${PLATFORM_LINKLIBS})
endfunction()
diff --git a/build_files/cmake/platform/platform_unix.cmake
b/build_files/cmake/platform/platform_unix.cmake
index 62f44cf..e33141f 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -298,7 +298,6 @@ if(WITH_OPENIMAGEIO)
${JPEG_LIBRARIES}
${ZLIB_LIBRARIES}
${BOOST_LIBRARIES}
- ${CMAKE_DL_LIBS}
)
set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute
path everywhere
set(OPENIMAGEIO_DEFINITIONS "")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
