diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-31 00:26:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-31 00:26:57 +0400 |
| commit | 427317d8d84345637738d4e4ed60cfd55f1bb595 (patch) | |
| tree | 7e4dcebff3688d9da68b37e23a3b79db3d83173c | |
| parent | 499bec2a85f892f170ab46c97a0f268ee5acdc0a (diff) | |
use CMAKE_DL_LIBS rather then linking libdl directly.
added to cycles standalone too.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c956fb2ca8c..040e393867b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -882,8 +882,6 @@ if(UNIX AND NOT APPLE) 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) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index ace1ed912be..e392666ea96 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -387,7 +387,7 @@ macro(setup_liblinks 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 diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index ded00f61b36..d5446ed1d48 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -45,7 +45,7 @@ if(WITH_CYCLES_STANDALONE) 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) |