From 1365e1f4e0e78593ddeba49c24e147a50a5960c1 Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Sat, 25 Jun 2016 06:05:59 +0800
Subject: [PATCH] restore travis and CMakeLists

---
 .travis.yml    | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-
 CMakeLists.txt | 41 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5043b5dd..c5ff05f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,6 +82,55 @@ script:
   - mv -v bin/ nana-demo/
   - cd nana-demo/bin
   - ls
-  - ./main
+  - ./a_group_impl
+  - ./animate-bmp
+  - ./audio_player
+  - ./background-effects
+  #- ./calculator 
+  - ./categ
+  - ./clicked
+  - ./decore
+  - ./dock
+  - ./drag-button
+  - ./draw
+  #- ./file_explorer
+  #- ./example_menu
+  - ./example_listbox
+  #- ./example_combox
+  - ./example.button
+  #- ./folder_tree_nana
+  #- ./folder_tree_std
+  - ./framework_design_1
+  - ./framework_design_2
+  - ./framework_design_3
+  - ./group
+  - ./HelloWord
+  #- ./helloword_quit
+  #- ./inputbox  
+  - ./label_listener  
+  #- ./lambda_event.cpp11  
+  - ./listbox_inline_widget  
+  - ./listbox_Resolver  
+  - ./loader_1  
+  #- ./loader_2  
+  - ./mbox  
+  - ./menu_debug  
+  #- ./MontiHall
+  #- ./helloworld_demo 
+  #- ./notepad 
+  - ./menu_debug  
+  - ./menu_popuper  
+  #- ./modal_form   
+  #- ./widget_show2
+  #- ./widget_show
+  - ./place_login  
+  - ./png  
+  #- ./screen  
+  - ./stretch_image  
+  - ./threading  
+  #- ./thread-pool  
+  - ./various_events  
+  #- ./window-dragger
+  - ./windows-subclassing   
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f01f493..e46796a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,9 +320,48 @@ if (NANA_CMAKE_BUILD_DEMOS)
          enable_testing ()
 	endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
 
+    set (demos    calculator file_explorer helloworld_demo notepad        )
+
+    foreach ( demo ${demos})
+        add_executable(${demo} "../nana-demo/${demo}.cpp")
+        set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
+        target_link_libraries(${demo} ${PROJECT_NAME})        # ${NANA_LINKS} or ${CMAKE_EXE_LINKER_FLAGS} 
+        #if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
+            #add_custom_command( TARGET  ${demo} POST_BUILD COMMAND  ${demo} )
+            #add_custom_target(do_always_${demo} ALL COMMAND ${demo})
+            #add_test(${demo} COMMAND ${demo})
+        #endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
+        install(TARGETS ${demo} RUNTIME DESTINATION  "../nana-demo/")
+        message("... to build: ../nana-demo/${demo}.cpp" )
+    endforeach( demo ${demos})
+
+    set (demos    widget_show widget_show2      )
+
+    #if (NANA_CMAKE_BUILD_FreeMe)
+      # add_definitions(-DBUILD_FreeMe)
+    #endif (NANA_CMAKE_BUILD_FreeMe)
+
+    # if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
+    #    list(APPEND demos  )    # ?? FreeMe
+    # endif (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
+    # Pending:      FreeMe (added but really completelly compiled if defined BUILD_FreeMe  )
+
+    foreach ( demo ${demos})
+        add_executable(${demo} "../nana-demo/${demo}.cpp")
+        set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
+        target_link_libraries(${demo} ${PROJECT_NAME})                 # ${NANA_LINKS} or ${CMAKE_EXE_LINKER_FLAGS} 
+        install(TARGETS ${demo} RUNTIME DESTINATION  "../nana-demo/")
+        message("... to build: ../nana-demo/${demo}.cpp" )
+    endforeach( demo ${demos})
 
 
-    set (demos    main    )
+    set (demos    a_group_impl  animate-bmp  audio_player audio_player_simple  background-effects categ clicked
+                  decore dock  drag-button  draw example.button example_combox example_listbox example_menu
+                  filebox-txt folder_tree folder_tree_nana folder_tree_std framework_design_1 framework_design_2 framework_design_3
+                  group HelloWord helloword_quit inputbox label_listener lambda_event.Cpp11 listbox_inline_widget listbox_Resolver loader_1 loader_2
+                  main mbox menu_debug menu_popuper modal_form MontiHall place_login png screen stretch_image
+                  threading thread-pool various_events window-dragger windows-subclassing
+                  )
     # Pending: 
     
     foreach ( demo ${demos})