From 738563f9736a48b3f1ec420d3a71d88dd2180e88 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Fri, 3 Jan 2014 16:42:21 +0000 Subject: Fixed missing libdl dependency in CMake builds (STR #2977). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10042 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 1 + CMakeLists.txt | 4 +++- CREDITS | 1 + src/CMakeLists.txt | 8 ++++---- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 9ab29ca7c..62a1691dd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ CHANGES IN FLTK 1.3.3 RELEASED: MMM DD YYYY + - Fixed missing libdl dependency in CMake builds (STR #2977). - Fixed segfault in fl_set_fonts_xft.cxx when loading fonts not named as expected (STR #2976). - Removed autoconf/configure and CMake tests and defines for diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f81c9698..41e880878 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,7 @@ if(APPLE) set(HAVE_STRCASECMP 1) set(HAVE_DIRENT_H 1) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa") endif(APPLE) if(WIN32) @@ -138,6 +139,7 @@ mark_as_advanced(FREETYPE_PATH) ####################################################################### # libraries find_library(LIB_CAIRO cairo) +find_library(LIB_dl dl) find_library(LIB_fontconfig fontconfig) find_library(LIB_freetype freetype) find_library(LIB_GL GL) @@ -146,7 +148,7 @@ find_library(LIB_jpeg jpeg) find_library(LIB_png png) find_library(LIB_zlib z) -mark_as_advanced(LIB_CAIRO LIB_fontconfig LIB_freetype) +mark_as_advanced(LIB_CAIRO LIB_dl LIB_fontconfig LIB_freetype) mark_as_advanced(LIB_GL LIB_MesaGL) mark_as_advanced(LIB_jpeg LIB_png LIB_zlib) diff --git a/CREDITS b/CREDITS index 2b23e40be..a850b0358 100644 --- a/CREDITS +++ b/CREDITS @@ -52,6 +52,7 @@ OTHER CONTRIBUTORS Alexander Rabi James Roth Albrecht Schlosser + Jamie Snape Andrea Suatoni Michael Surette Paul Sydney diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 14915be9a..2ca156049 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -220,7 +220,7 @@ if(MSVC) endif(MSVC) if(USE_THREADS) - target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl}) endif(USE_THREADS) if(USE_X11) @@ -338,7 +338,7 @@ else() endif(MSVC) if(USE_THREADS) - target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl}) endif(USE_THREADS) if(USE_X11) @@ -388,11 +388,11 @@ else() endif(MSVC) if(USE_THREADS) - target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(fltk_forms_SHARED ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl}) endif(USE_THREADS) if(USE_X11) - target_link_libraries(fltk_SHARED ${X11_LIBRARIES}) + target_link_libraries(fltk_forms_SHARED ${X11_LIBRARIES}) endif(USE_X11) ####################################################################### -- cgit v1.2.3