diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-06-13 14:22:22 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-06-13 14:22:22 +0200 |
| commit | b8318480f515c9ca0e7257ca7ca4c73c56a4a080 (patch) | |
| tree | ba798c62e5354e4d699dad0c1d0e4d1121eef35c /src | |
| parent | 6279ab0586d86eaac65839c73eb5b67e84d1ece3 (diff) | |
CMake: Build static and shared libs side-by-side
Clean up library and variable names.
Remove '_SHARED' suffix from library (output) filenames.
This commit was inspired by David Runge ('dvzrv'), thanks.
See PR #21.
Fixes #21
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4683c1817..0205cb996 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -578,7 +578,7 @@ endif (OPTION_USE_SYSTEM_LIBPNG) if (OPENGL_FOUND) FL_ADD_LIBRARY(fltk_gl STATIC "${GLCPPFILES};${GL_HEADER_FILES};${GL_DRIVER_HEADER_FILES}") - target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES}) + target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES}) endif (OPENGL_FOUND) ####################################################################### @@ -616,21 +616,21 @@ if (OPTION_BUILD_SHARED_LIBS) endif (MSVC) if (OPTION_USE_SYSTEM_LIBJPEG) - target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES}) + target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES}) else() - target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED) + target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED) endif (OPTION_USE_SYSTEM_LIBJPEG) if (OPTION_USE_SYSTEM_LIBPNG) - target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES}) + target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES}) else() - target_link_libraries(fltk_images_SHARED fltk_png_SHARED) + target_link_libraries(fltk_images_SHARED fltk_png_SHARED) endif (OPTION_USE_SYSTEM_LIBPNG) if (OPTION_USE_SYSTEM_ZLIB) - target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES}) + target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES}) else() - target_link_libraries(fltk_images_SHARED fltk_z_SHARED) + target_link_libraries(fltk_images_SHARED fltk_z_SHARED) endif (OPTION_USE_SYSTEM_ZLIB) ################################################################### @@ -638,9 +638,9 @@ if (OPTION_BUILD_SHARED_LIBS) if (OPENGL_FOUND) FL_ADD_LIBRARY(fltk_gl SHARED "${GLCPPFILES};${GL_HEADER_FILES};${GL_DRIVER_HEADER_FILES}") if (MSVC) - target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES}) + target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES}) else () - target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES}) + target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES}) endif (MSVC) endif (OPENGL_FOUND) |