From c73ca85a7664deae18d4b5a1671e84c558160167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 14 Sep 2014 20:09:06 +0200 Subject: Fix hardcoded link flag to "dl" library Fix "dlopen" function detection --- CMakeLists.txt | 6 +++++- artsc/CMakeLists.txt | 2 +- libltdl | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d970382..a717527 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,6 +79,10 @@ set( DL_LIBRARIES dl ) check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL ) if( NOT HAVE_LIBDL ) unset( DL_LIBRARIES ) + check_function_exists( dlopen HAVE_DLOPEN ) + if( HAVE_DLOPEN ) + set( HAVE_LIBDL 1 ) + endif( HAVE_DLOPEN ) endif( NOT HAVE_LIBDL ) find_package( Threads ) @@ -88,7 +92,7 @@ find_package( Threads ) include( CheckFunctionExists ) set( bak_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ) -set( CMAKE_REQUIRED_LIBRARIES dl ) +set( CMAKE_REQUIRED_LIBRARIES ${DL_LIBRARIES} ) check_function_exists( dlerror HAVE_DLERROR ) check_function_exists( strcmp HAVE_STRCMP ) check_function_exists( strchr HAVE_STRCHR ) diff --git a/artsc/CMakeLists.txt b/artsc/CMakeLists.txt index 855c302..59833c1 100644 --- a/artsc/CMakeLists.txt +++ b/artsc/CMakeLists.txt @@ -65,7 +65,7 @@ install( FILES tde_add_library( artsdsp SHARED SOURCES artsdsp.c VERSION 0.0.0 - LINK artsc-shared dl + LINK artsc-shared ${DL_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libltdl b/libltdl index 9af400f..7aeb4e9 160000 --- a/libltdl +++ b/libltdl @@ -1 +1 @@ -Subproject commit 9af400f988b06e43f37167733d0404b66d0f4a81 +Subproject commit 7aeb4e9d71aeb59db6a2e40c271536fcff6b1e0e -- cgit v1.2.1