forked from bartvdbraak/blender
use CMAKE_DL_LIBS rather then linking libdl directly.
added to cycles standalone too.
This commit is contained in:
parent
499bec2a85
commit
427317d8d8
@ -882,8 +882,6 @@ if(UNIX AND NOT APPLE)
|
|||||||
|
|
||||||
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||||
if(NOT WITH_PYTHON_MODULE)
|
if(NOT WITH_PYTHON_MODULE)
|
||||||
# BSD's dont use libdl.so
|
|
||||||
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
|
|
||||||
# binreloc is linux only
|
# binreloc is linux only
|
||||||
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
|
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
|
||||||
set(WITH_BINRELOC ON)
|
set(WITH_BINRELOC ON)
|
||||||
|
@ -387,7 +387,7 @@ macro(setup_liblinks
|
|||||||
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
|
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(${target} ${PLATFORM_LINKLIBS})
|
target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(TEST_SSE_SUPPORT
|
macro(TEST_SSE_SUPPORT
|
||||||
|
@ -45,7 +45,7 @@ if(WITH_CYCLES_STANDALONE)
|
|||||||
cycles_xml.h
|
cycles_xml.h
|
||||||
)
|
)
|
||||||
add_executable(cycles ${SRC})
|
add_executable(cycles ${SRC})
|
||||||
target_link_libraries(cycles ${LIBRARIES})
|
target_link_libraries(cycles ${LIBRARIES} ${CMAKE_DL_LIBS})
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib)
|
set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib)
|
||||||
|
Loading…
Reference in New Issue
Block a user