gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CMake] Remove redundant linking in CMake build process (STR #3298).

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11442 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2016-03-27 16:56:23 +00:00
parent 16e1d9db41
commit 448e02574b
3 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMake/macros.cmake
View File

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

13
fluid/CMakeLists.txt
View File

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

9
src/CMakeLists.txt
View File

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