[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59673] trunk/blender: use CMAKE_DL_LIBS rather then linking libdl directly.
Campbell Barton
ideasman42 at gmail.com
Fri Aug 30 22:26:57 CEST 2013
Revision: 59673
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59673
Author: campbellbarton
Date: 2013-08-30 20:26:57 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
use CMAKE_DL_LIBS rather then linking libdl directly.
added to cycles standalone too.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/intern/cycles/app/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-08-30 19:32:19 UTC (rev 59672)
+++ trunk/blender/CMakeLists.txt 2013-08-30 20:26:57 UTC (rev 59673)
@@ -882,8 +882,6 @@
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE)
- # BSD's dont use libdl.so
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2013-08-30 19:32:19 UTC (rev 59672)
+++ trunk/blender/build_files/cmake/macros.cmake 2013-08-30 20:26:57 UTC (rev 59673)
@@ -387,7 +387,7 @@
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
- target_link_libraries(${target} ${PLATFORM_LINKLIBS})
+ target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
endmacro()
macro(TEST_SSE_SUPPORT
Modified: trunk/blender/intern/cycles/app/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/app/CMakeLists.txt 2013-08-30 19:32:19 UTC (rev 59672)
+++ trunk/blender/intern/cycles/app/CMakeLists.txt 2013-08-30 20:26:57 UTC (rev 59673)
@@ -45,7 +45,7 @@
cycles_xml.h
)
add_executable(cycles ${SRC})
- target_link_libraries(cycles ${LIBRARIES})
+ target_link_libraries(cycles ${LIBRARIES} ${CMAKE_DL_LIBS})
if(UNIX AND NOT APPLE)
set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib)
More information about the Bf-blender-cvs
mailing list