From 448e02574bebb258c05441c853849ceeac8968de Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Sun, 27 Mar 2016 16:56:23 +0000
Subject: [PATCH] [CMake] Remove redundant linking in CMake build process (STR
 #3298).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11442 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CMake/macros.cmake   | 13 -------------
 fluid/CMakeLists.txt | 13 +------------
 src/CMakeLists.txt   |  9 +++++++++
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index 2a3a69d63..057c267dd 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -163,19 +163,6 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
 
     target_link_libraries(${tname} ${LIBRARIES})
 
-    # link in optional libraries
-    if (USE_XFT)
-        target_link_libraries(${tname} ${X11_Xft_LIB})
-    endif (USE_XFT)
-
-    if (HAVE_XINERAMA)
-        target_link_libraries(${tname} ${X11_Xinerama_LIB})
-    endif (HAVE_XINERAMA)
-
-    if (HAVE_XRENDER)
-        target_link_libraries(${tname} ${X11_Xrender_LIB})
-    endif (HAVE_XRENDER)
-
 endmacro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
 
 #######################################################################
diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
index 87931114c..5dc5364c4 100644
--- a/fluid/CMakeLists.txt
+++ b/fluid/CMakeLists.txt
@@ -48,18 +48,7 @@ endif(APPLE AND NOT OPTION_APPLE_X11)
 
 target_link_libraries(fluid fltk fltk_images fltk_forms)
 
-# link in optional libraries
-if(USE_XFT)
-   target_link_libraries(fluid ${X11_Xft_LIB})
-endif(USE_XFT)
-
-if(HAVE_XINERAMA)
-   target_link_libraries(fluid ${X11_Xinerama_LIB})
-endif(HAVE_XINERAMA)
-
-if(HAVE_XRENDER)
-   target_link_libraries(fluid ${X11_Xrender_LIB})
-endif(HAVE_XRENDER)
+# create bundle for Mac OS X
 
 if(APPLE AND NOT OPTION_APPLE_X11)
   set_target_properties(fluid PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ef9cd040..ec397bc5c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -245,6 +245,10 @@ if(HAVE_XCURSOR)
    target_link_libraries(fltk ${X11_Xcursor_LIB})
 endif(HAVE_XCURSOR)
 
+if (HAVE_XRENDER)
+    target_link_libraries(fltk ${X11_Xrender_LIB})
+endif (HAVE_XRENDER)
+
 if(USE_XFT)
    target_link_libraries(fltk ${X11_Xft_LIB})
    if(LIB_fontconfig)
@@ -252,6 +256,7 @@ if(USE_XFT)
    endif(LIB_fontconfig)
 endif(USE_XFT)
 
+
 #######################################################################
 FL_ADD_LIBRARY(fltk_forms STATIC "${FLCPPFILES}")
 target_link_libraries(fltk_forms fltk)
@@ -324,6 +329,10 @@ if(HAVE_XCURSOR)
    target_link_libraries(fltk_SHARED ${X11_Xcursor_LIB})
 endif(HAVE_XCURSOR)
 
+if (HAVE_XRENDER)
+    target_link_libraries(fltk_SHARED ${X11_Xrender_LIB})
+endif (HAVE_XRENDER)
+
 if(USE_XFT)
    target_link_libraries(fltk_SHARED ${X11_Xft_LIB})
    if(LIB_fontconfig)