From 442747a9c681a5cd40ae1e3c46dfb69da55a2d4a Mon Sep 17 00:00:00 2001
From: qPCR4vir <arielvina@yahoo.es>
Date: Fri, 12 Feb 2016 03:29:37 +0100
Subject: [PATCH] clean

---
 CMakeLists.txt | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 598c4c1f..f740dae9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,8 +91,6 @@ 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
@@ -107,8 +105,6 @@ 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)
@@ -227,28 +223,28 @@ if (BUILD_NANA_DEMOS)
 
     add_executable(notepad ../nana-demo/notepad.cpp)
     set_property( TARGET notepad PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(notepad ${PROJECT_NAME} )# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(notepad ${PROJECT_NAME} )
     install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN})
 
 	if (OFF)
     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 ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(widget_show ${PROJECT_NAME})
     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 ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(widget_show2 ${PROJECT_NAME})
     install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN})
 	endif(OFF)
 	
     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 ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(a_group_impl ${PROJECT_NAME})
 
     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 ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(animate-bmp ${PROJECT_NAME})
 
 	if (ENABLE_AUDIO)
 		add_executable(audio_player ../nana-demo/Examples/audio_player.cpp)
@@ -258,7 +254,7 @@ if (BUILD_NANA_DEMOS)
 
     #add_executable(nana_test test.cpp)
     #set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 )
-    #target_link_libraries(nana_test ${PROJECT_NAME})#  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    #target_link_libraries(nana_test ${PROJECT_NAME})
 
    #set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo)
    #set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/)
@@ -269,7 +265,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 ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+   #    target_link_libraries(${demoname} ${PROJECT_NAME} )
    #endforeach( demofile ${DEMO_SOURCES} )
 endif(BUILD_NANA_DEMOS)