mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CMake] Restore ability to build shared libs under Linux etc.

Browse Source 
Under Linux we link the shared image libs and forms libs with fltk_SHARED
(again), but this does currently not work with Visual Studio, hence we
need to differentiate in src/CMakeLists.txt when building shared libs.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11866 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2016-08-08 14:17:22 +00:00
parent ba56c33726
commit 6e688a52be
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/CMakeLists.txt
View File

@ -316,6 +316,13 @@ endif (OPENGL_FOUND)
# Build shared libraries (optional)
#######################################################################
# Note to devs: As of 08 Aug 2016 we can build shared libs (dlls)
# under Windows with Visual Studio (MSVC) but we can't link for instance
# fltk_images_SHARED with fltk_SHARED - we have to use fltk, i.e. the
# "static" object library instead. I don't know how to fix this, but
# at least we can build shared libraries (dlls) with Visual Studio.
# AlbrechtS
if (OPTION_BUILD_SHARED_LIBS)
FL_ADD_LIBRARY(fltk SHARED "${SHARED_FILES}")
@ -324,12 +331,20 @@ if (OPTION_BUILD_SHARED_LIBS)
###################################################################
FL_ADD_LIBRARY(fltk_forms SHARED "${FLCPPFILES}")
target_link_libraries(fltk_forms_SHARED fltk)
if (MSVC)
target_link_libraries(fltk_forms_SHARED fltk)
else ()
target_link_libraries(fltk_forms_SHARED fltk_SHARED)
endif (MSVC)
###################################################################
FL_ADD_LIBRARY(fltk_images SHARED "${IMGCPPFILES}")
target_link_libraries(fltk_images_SHARED fltk)
if (MSVC)
target_link_libraries(fltk_images_SHARED fltk)
else ()
target_link_libraries(fltk_images_SHARED fltk_SHARED)
endif (MSVC)
if (OPTION_USE_SYSTEM_LIBJPEG)
target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
@ -352,8 +367,12 @@ if (OPTION_BUILD_SHARED_LIBS)
###################################################################
if (OPENGL_FOUND)
FL_ADD_LIBRARY(fltk_gl SHARED "${GLCPPFILES}")
target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES})
FL_ADD_LIBRARY(fltk_gl SHARED "${GLCPPFILES}")
if (MSVC)
target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES})
else ()
target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
endif (MSVC)
endif (OPENGL_FOUND)
endif (OPTION_BUILD_SHARED_LIBS)