FLTK logo

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

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] e80a273 - Fix build error with CMake when libjpeg???-dev package is absent from the system (Linux). "ManoloFLTK" Jan 04, 2022  
 
commit e80a2734e847bdbbf060b52f86890b409b033710
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Tue Jan 4 16:20:39 2022 +0100
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Tue Jan 4 16:20:49 2022 +0100

    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.

 src/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git src/CMakeLists.txt src/CMakeLists.txt
index 6a6178b..a86f5ce 100644
--- src/CMakeLists.txt
+++ 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})
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.