Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 19:10:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build error with CMake when libjpeg???-dev package is absent from the system (Linux).

Browse Source 
The error was visible under Linux if OPTION_USE_SYSTEM_LIBJPEG and OPTION_BUILD_SHARED_LIBS are  on.
This commit is contained in:
ManoloFLTK
2022-01-04 16:20:39 +01:00
parent 9164e3c489
commit e80a2734e8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+6 -6
View File
@@ -571,11 +571,11 @@ target_link_libraries (fltk_forms fltk)
FL_ADD_LIBRARY (fltk_images STATIC "${IMGCPPFILES}") FL_ADD_LIBRARY (fltk_images STATIC "${IMGCPPFILES}")
target_link_libraries (fltk_images fltk) target_link_libraries (fltk_images fltk)
if (OPTION_USE_SYSTEM_LIBJPEG) if (NOT FLTK_USE_BUILTIN_JPEG)
target_link_libraries (fltk_images ${FLTK_JPEG_LIBRARIES}) target_link_libraries (fltk_images ${FLTK_JPEG_LIBRARIES})
else() else()
target_link_libraries (fltk_images fltk_jpeg) target_link_libraries (fltk_images fltk_jpeg)
endif (OPTION_USE_SYSTEM_LIBJPEG) endif (NOT FLTK_USE_BUILTIN_JPEG)
if (OPTION_USE_SYSTEM_ZLIB) if (OPTION_USE_SYSTEM_ZLIB)
target_link_libraries (fltk_images ${FLTK_ZLIB_LIBRARIES}) target_link_libraries (fltk_images ${FLTK_ZLIB_LIBRARIES})
@@ -617,11 +617,11 @@ if (OPTION_BUILD_SHARED_LIBS AND NOT MSVC)
FL_ADD_LIBRARY (fltk_images SHARED "${IMGCPPFILES}") FL_ADD_LIBRARY (fltk_images SHARED "${IMGCPPFILES}")
target_link_libraries (fltk_images_SHARED fltk_SHARED) target_link_libraries (fltk_images_SHARED fltk_SHARED)
if (OPTION_USE_SYSTEM_LIBJPEG) if (NOT FLTK_USE_BUILTIN_JPEG)
target_link_libraries (fltk_images_SHARED ${FLTK_JPEG_LIBRARIES}) target_link_libraries (fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
else() else()
target_link_libraries (fltk_images_SHARED fltk_jpeg_SHARED) target_link_libraries (fltk_images_SHARED fltk_jpeg_SHARED)
endif (OPTION_USE_SYSTEM_LIBJPEG) endif (NOT FLTK_USE_BUILTIN_JPEG)
if (OPTION_USE_SYSTEM_LIBPNG) if (OPTION_USE_SYSTEM_LIBPNG)
target_link_libraries (fltk_images_SHARED ${FLTK_PNG_LIBRARIES}) target_link_libraries (fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
@@ -663,11 +663,11 @@ if (OPTION_BUILD_SHARED_LIBS AND MSVC)
FL_ADD_LIBRARY (fltk SHARED "${SOURCES}") FL_ADD_LIBRARY (fltk SHARED "${SOURCES}")
target_link_libraries (fltk_SHARED ${OPTIONAL_LIBS}) target_link_libraries (fltk_SHARED ${OPTIONAL_LIBS})
if (OPTION_USE_SYSTEM_LIBJPEG) if (NOT FLTK_USE_BUILTIN_JPEG)
target_link_libraries (fltk_SHARED ${FLTK_JPEG_LIBRARIES}) target_link_libraries (fltk_SHARED ${FLTK_JPEG_LIBRARIES})
else() else()
target_link_libraries (fltk_SHARED fltk_jpeg_SHARED) target_link_libraries (fltk_SHARED fltk_jpeg_SHARED)
endif (OPTION_USE_SYSTEM_LIBJPEG) endif (NOT FLTK_USE_BUILTIN_JPEG)
if (OPTION_USE_SYSTEM_LIBPNG) if (OPTION_USE_SYSTEM_LIBPNG)
target_link_libraries (fltk_SHARED ${FLTK_PNG_LIBRARIES}) target_link_libraries (fltk_SHARED ${FLTK_PNG_LIBRARIES})