diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-01-04 16:20:39 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-01-04 16:20:49 +0100 |
| commit | e80a2734e847bdbbf060b52f86890b409b033710 (patch) | |
| tree | c6e80f57709faa095c531a118f4f6abe6f81e0c0 /src | |
| parent | 9164e3c48973a2a07bcb82a2bfff1a50a532e69e (diff) | |
Fix build error with CMake when libjpeg???-dev package is absent from the system (Linux).
The error was visible under Linux if OPTION_USE_SYSTEM_LIBJPEG and OPTION_BUILD_SHARED_LIBS are on.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6a6178bf9..a86f5ce2d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -571,11 +571,11 @@ target_link_libraries (fltk_forms fltk) FL_ADD_LIBRARY (fltk_images STATIC "${IMGCPPFILES}") 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}) else() target_link_libraries (fltk_images fltk_jpeg) -endif (OPTION_USE_SYSTEM_LIBJPEG) +endif (NOT FLTK_USE_BUILTIN_JPEG) if (OPTION_USE_SYSTEM_ZLIB) 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}") 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}) else() 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) 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}") 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}) else() target_link_libraries (fltk_SHARED fltk_jpeg_SHARED) - endif (OPTION_USE_SYSTEM_LIBJPEG) + endif (NOT FLTK_USE_BUILTIN_JPEG) if (OPTION_USE_SYSTEM_LIBPNG) target_link_libraries (fltk_SHARED ${FLTK_PNG_LIBRARIES}) |