mirror of
https://github.com/fltk/fltk.git
synced 2026-06-04 23:42:15 +08:00
[CMake] Remove redundant linking in CMake build process (STR #3298).
[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
This commit is contained in:
+5
-12
@@ -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
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user