diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-03-27 20:59:39 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-03-27 20:59:39 +0000 |
| commit | 3dfec155adf812941e4478b210d1bee4dbd56c01 (patch) | |
| tree | a28684d44439de622b48a24391f38b4de3aeae2d /CMake | |
| parent | baf41cac1a03e18c3f6c60196cc5b0f1dd367884 (diff) | |
[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
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 2af030e9c..242153c3a 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -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) ####################################################################### |