diff options
| author | François Andriot <francois.andriot@free.fr> | 2014-09-14 20:09:06 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-09-14 20:19:46 +0200 |
| commit | c73ca85a7664deae18d4b5a1671e84c558160167 (patch) | |
| tree | c4a2f96654f296d6544f126aa4a7fe5efa6a3d73 | |
| parent | 86b0785b2a068407219cf22386e567c476a0eb03 (diff) | |
| download | arts-c73ca85a7664deae18d4b5a1671e84c558160167.tar.gz arts-c73ca85a7664deae18d4b5a1671e84c558160167.zip | |
Fix hardcoded link flag to "dl" library
Fix "dlopen" function detection
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | artsc/CMakeLists.txt | 2 | ||||
| m--------- | libltdl | 0 |
3 files changed, 6 insertions, 2 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 -Subproject 9af400f988b06e43f37167733d0404b66d0f4a8 +Subproject 7aeb4e9d71aeb59db6a2e40c271536fcff6b1e0 |