From ea4bac6e9cc4083d501f1779948b0c003b9ad687 Mon Sep 17 00:00:00 2001
From: nabijaczleweli-vm <nabijaczleweli@gmail.com>
Date: Thu, 11 Feb 2016 18:20:50 +0100
Subject: [PATCH] Link to libjpeg and libpng when appropriate

---
 CMakeLists.txt | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbce8493..46672aa3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,7 @@ endif(UNIX)
 #Find PNG
 if(ENABLE_PNG)
     add_definitions(-DNANA_ENABLE_PNG)
+    set(NANA_PNG_LIB "png")
     if(LIBPNG_FROM_OS)
         find_package(PNG)
         if (PNG_FOUND)
@@ -81,11 +82,14 @@ if(ENABLE_PNG)
             add_definitions(-DUSE_LIBPNG_FROM_OS)
         endif(PNG_FOUND)
     endif(LIBPNG_FROM_OS)
+else(ENABLE_PNG)
+    set(NANA_PNG_LIB "")
 endif(ENABLE_PNG)
 
 #Find JPEG
 if(ENABLE_JPEG)
     add_definitions(-DNANA_ENABLE_JPEG)
+    set(NANA_JPEG_LIB "jpeg")
     if(LIBJPEG_FROM_OS)
         find_package(JPEG)
         if (JPEG_FOUND)
@@ -93,6 +97,8 @@ if(ENABLE_JPEG)
             add_definitions(-DUSE_LIBJPEG_FROM_OS)
         endif(JPEG_FOUND)
     endif(LIBJPEG_FROM_OS)
+else(ENABLE_JPEG)
+    set(NANA_JPEG_LIB "")
 endif(ENABLE_JPEG)
 
 if(ENABLE_AUDIO)
@@ -189,52 +195,52 @@ if (BUILD_NANA_DEMOS)
     set(CMAKE_INSTALL_PREFIX )
     add_executable(file_explorer ../nana-demo/file_explorer.cpp)
     set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(file_explorer ${PROJECT_NAME} X11 Xft)
+    target_link_libraries(file_explorer ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(calculator ../nana-demo/calculator.cpp)
     set_property( TARGET calculator PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(calculator ${PROJECT_NAME} X11 Xft)
+    target_link_libraries(calculator ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS calculator RUNTIME DESTINATION &{DEMO_BIN})
 
     if (BUILD_FreeMe)
         add_executable(FreeMe ../nana-demo/FreeMe.cpp)
         set_property( TARGET FreeMe PROPERTY CXX_STANDARD 14 )
-        target_link_libraries(FreeMe ${PROJECT_NAME} X11 Xft)
+        target_link_libraries(FreeMe ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
         install(TARGETS FreeMe RUNTIME DESTINATION &{DEMO_BIN})
     endif (BUILD_FreeMe)     
 
     add_executable(notepad ../nana-demo/notepad.cpp)
     set_property( TARGET notepad PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(notepad ${PROJECT_NAME} X11 Xft)
+    target_link_libraries(notepad ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(widget_show ../nana-demo/widget_show.cpp)
     set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(widget_show ${PROJECT_NAME} X11 Xft)
+    target_link_libraries(widget_show ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS widget_show RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(widget_show2 ../nana-demo/widget_show2.cpp)
     set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(widget_show2 ${PROJECT_NAME} X11 Xft)
+    target_link_libraries(widget_show2 ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(a_group_impl ../nana-demo/Examples/a_group_impl.cpp)
     set_property( TARGET a_group_impl PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(a_group_impl ${PROJECT_NAME} X11 Xft)
+    target_link_libraries(a_group_impl ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
     add_executable(animate-bmp ../nana-demo/Examples/animate-bmp.cpp)
     set_property( TARGET animate-bmp PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(animate-bmp ${PROJECT_NAME} X11 Xft)
+    target_link_libraries(animate-bmp ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
     add_executable(audio_player ../nana-demo/Examples/audio_player.cpp)
     set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(audio_player ${PROJECT_NAME} X11 Xft)
+    target_link_libraries(audio_player ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
 
     #add_executable(nana_test test.cpp)
     #set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 )
-    #target_link_libraries(nana_test ${PROJECT_NAME} X11 Xft)
+    #target_link_libraries(nana_test ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
    #set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo)
    #set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/)
@@ -245,7 +251,7 @@ if (BUILD_NANA_DEMOS)
    #    string( REPLACE ".cpp" "" demoname ${demofile} )
    #    add_executable( ${demoname} ${demofile} )
    #    set_property( TARGET ${demoname} PROPERTY CXX_STANDARD 14 )
-   #    target_link_libraries(${demoname} ${PROJECT_NAME} X11 Xft)
+   #    target_link_libraries(${demoname} ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
    #endforeach( demofile ${DEMO_SOURCES} )
 endif(BUILD_NANA_DEMOS)