Skip to content

Commit

Permalink
[CMake] Remove redundant linking in CMake build process (STR #3298).
Browse files Browse the repository at this point in the history
[CMake] Simplify CMake build files, remove redundancies.

Ports of branch-1.3, svn r 11442 and 11444:

Remove src/fl_call_main.c from non-Windows (static) libraries. It would
be an empty object file anyway.
 
Use CMake variables to set up used files and linked libraries to remove
redundancies. All files and libs are used only in the definition of
CMake variables and used later in static and shared builds, resp.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11447 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
Albrecht Schlosser committed Mar 27, 2016
1 parent baf41ca commit 3dfec15
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 177 deletions.
18 changes: 0 additions & 18 deletions CMake/macros.cmake
Expand Up @@ -163,24 +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)

if (OPTION_APPLE_SDL)
target_link_libraries(${tname} ${SDL2_LIBRARY})
endif(OPTION_APPLE_SDL)


endmacro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)

#######################################################################
17 changes: 5 additions & 12 deletions fluid/CMakeLists.txt
Expand Up @@ -48,22 +48,13 @@ endif(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))

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)
# install fluid

if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
# create bundle
set_target_properties(fluid PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME})
set_target_properties(fluid PROPERTIES RESOURCE ${ICON_PATH})
# install
install(TARGETS fluid DESTINATION ${FLTK_BINDIR})
else()
install(TARGETS fluid
Expand All @@ -74,6 +65,8 @@ else()
)
endif(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))

# install desktop files

if(UNIX)
install(FILES fluid.desktop
DESTINATION ${FLTK_DATADIR}/applications
Expand Down

0 comments on commit 3dfec15

Please sign in to comment.