CMake: Fix image libraries build if fallback is used

The CMake instructions would use the wrong image libs (png, jpeg, zlib)
if the fallback was active (OPTION_USE_SYSTEM_XXX) was true but the
header files were not present.

This had already been fixed for jpeg but not for the other two libs.
This commit rearranges the logic for all three libs.

Add information about builtin or system libraries to config summary.

1 files changed, 36 insertions, 36 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aa0eed11f..9dc09f882 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -511,23 +511,23 @@ target_link_libraries (fltk_forms fltk)
 FL_ADD_LIBRARY (fltk_images STATIC "${IMGCPPFILES}")
 target_link_libraries (fltk_images fltk)
 
-if (NOT FLTK_USE_BUILTIN_JPEG)
-  target_link_libraries (fltk_images ${FLTK_JPEG_LIBRARIES})
-else()
+if (FLTK_USE_BUILTIN_JPEG)
   target_link_libraries (fltk_images fltk_jpeg)
-endif (NOT FLTK_USE_BUILTIN_JPEG)
-
-if (OPTION_USE_SYSTEM_ZLIB)
-  target_link_libraries (fltk_images ${FLTK_ZLIB_LIBRARIES})
 else()
-  target_link_libraries (fltk_images fltk_z)
-endif (OPTION_USE_SYSTEM_ZLIB)
+  target_link_libraries (fltk_images ${FLTK_JPEG_LIBRARIES})
+endif ()
 
-if (OPTION_USE_SYSTEM_LIBPNG)
-  target_link_libraries (fltk_images ${FLTK_PNG_LIBRARIES})
+if (FLTK_USE_BUILTIN_ZLIB)
+  target_link_libraries (fltk_images fltk_z)
 else()
+  target_link_libraries (fltk_images ${FLTK_ZLIB_LIBRARIES})
+endif ()
+
+if (FLTK_USE_BUILTIN_PNG)
   target_link_libraries (fltk_images fltk_png)
-endif (OPTION_USE_SYSTEM_LIBPNG)
+else()
+  target_link_libraries (fltk_images ${FLTK_PNG_LIBRARIES})
+endif ()
 
 #######################################################################
 
@@ -557,23 +557,23 @@ if (OPTION_BUILD_SHARED_LIBS AND NOT MSVC)
   FL_ADD_LIBRARY (fltk_images SHARED "${IMGCPPFILES}")
   target_link_libraries (fltk_images_SHARED fltk_SHARED)
 
-  if (NOT FLTK_USE_BUILTIN_JPEG)
-    target_link_libraries (fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
-  else()
+  if (FLTK_USE_BUILTIN_JPEG)
     target_link_libraries (fltk_images_SHARED fltk_jpeg_SHARED)
-  endif (NOT FLTK_USE_BUILTIN_JPEG)
-
-  if (OPTION_USE_SYSTEM_LIBPNG)
-    target_link_libraries (fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
   else()
-    target_link_libraries (fltk_images_SHARED fltk_png_SHARED)
-  endif (OPTION_USE_SYSTEM_LIBPNG)
+    target_link_libraries (fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
+  endif ()
 
-  if (OPTION_USE_SYSTEM_ZLIB)
-    target_link_libraries (fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES})
+  if (FLTK_USE_BUILTIN_PNG)
+    target_link_libraries (fltk_images_SHARED fltk_png_SHARED)
   else()
+    target_link_libraries (fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
+  endif ()
+
+  if (FLTK_USE_BUILTIN_ZLIB)
     target_link_libraries (fltk_images_SHARED fltk_z_SHARED)
-  endif (OPTION_USE_SYSTEM_ZLIB)
+  else()
+    target_link_libraries (fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES})
+  endif ()
 
   ###################################################################
 
@@ -603,23 +603,23 @@ if (OPTION_BUILD_SHARED_LIBS AND MSVC)
   FL_ADD_LIBRARY (fltk SHARED "${SOURCES}")
   target_link_libraries (fltk_SHARED ${OPTIONAL_LIBS})
 
-  if (NOT FLTK_USE_BUILTIN_JPEG)
-    target_link_libraries (fltk_SHARED ${FLTK_JPEG_LIBRARIES})
-  else()
+  if (FLTK_USE_BUILTIN_JPEG)
     target_link_libraries (fltk_SHARED fltk_jpeg_SHARED)
-  endif (NOT FLTK_USE_BUILTIN_JPEG)
-
-  if (OPTION_USE_SYSTEM_LIBPNG)
-    target_link_libraries (fltk_SHARED ${FLTK_PNG_LIBRARIES})
   else()
-    target_link_libraries (fltk_SHARED fltk_png_SHARED)
-  endif (OPTION_USE_SYSTEM_LIBPNG)
+    target_link_libraries (fltk_SHARED ${FLTK_JPEG_LIBRARIES})
+  endif ()
 
-  if (OPTION_USE_SYSTEM_ZLIB)
-    target_link_libraries (fltk_SHARED ${FLTK_ZLIB_LIBRARIES})
+  if (FLTK_USE_BUILTIN_PNG)
+    target_link_libraries (fltk_SHARED fltk_png_SHARED)
   else()
+    target_link_libraries (fltk_SHARED ${FLTK_PNG_LIBRARIES})
+  endif ()
+
+  if (FLTK_USE_BUILTIN_ZLIB)
     target_link_libraries (fltk_SHARED fltk_z_SHARED)
-  endif (OPTION_USE_SYSTEM_ZLIB)
+  else()
+    target_link_libraries (fltk_SHARED ${FLTK_ZLIB_LIBRARIES})
+  endif ()
 
   if (OPENGL_FOUND)
     target_link_libraries (fltk_SHARED ${OPENGL_LIBRARIES})