[CMake] Improve handling of ldl and X11 libraries (STR #3196).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10590 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Feb 24, 2015 · d266316 · d266316
1 parent a88c1f2
commit d266316
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -213,8 +213,12 @@ endif(APPLE)
 #######################################################################
 FL_ADD_LIBRARY(fltk STATIC "${CPPFILES};${MMFILES};${CFILES};fl_call_main.c")
 
+if(LIB_dl)
+   target_link_libraries(fltk ${LIB_dl})
+endif(LIB_dl)
+
 if(USE_THREADS)
-   target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl})
+   target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT})
 endif(USE_THREADS)
 
 if(USE_X11)
@@ -288,8 +292,12 @@ if(OPTION_BUILD_SHARED_LIBS)
 #######################################################################
 FL_ADD_LIBRARY(fltk SHARED "${CPPFILES};${MMFILES};${CFILES}")
 
+if(LIB_dl)
+   target_link_libraries(fltk_SHARED ${LIB_dl})
+endif(LIB_dl)
+
 if(USE_THREADS)
-   target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl})
+   target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
 endif(USE_THREADS)
 
 if(USE_X11)