Browse Source

Fix hardcoded link flag to "dl" library

Fix "dlopen" function detection
tags/r14.0.0
François Andriot 5 years ago
parent
commit
c73ca85a76
3 changed files with 7 additions and 3 deletions
  1. +5
    -1
      CMakeLists.txt
  2. +1
    -1
      artsc/CMakeLists.txt
  3. +1
    -1
      libltdl

+ 5
- 1
CMakeLists.txt View File

@@ -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 )


+ 1
- 1
artsc/CMakeLists.txt View File

@@ -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}
)



+ 1
- 1
libltdl

@@ -1 +1 @@
Subproject commit 9af400f988b06e43f37167733d0404b66d0f4a81
Subproject commit 7aeb4e9d71aeb59db6a2e40c271536fcff6b1e0e

Loading…
Cancel
Save