Merge branch 'qPCR4vir-hotfix-1.3_jh' into hotfix-1.3

.travis.yml

@@ -76,7 +76,7 @@ before_script :
   - cd bin
 
 script:
-  - cmake -G"Unix Makefiles" .. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_ENABLE_PNG=OFF -DNANA_CMAKE_BUILD_DEMOS=ON -DNANA_CMAKE_ENABLE_AUDIO=OFF -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=ON -DNANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON
+  - cmake -G"Unix Makefiles" .. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_ENABLE_PNG=OFF -DNANA_CMAKE_BUILD_DEMOS=ON -DNANA_CMAKE_ENABLE_AUDIO=OFF -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=ON -DNANA_CMAKE_BOOST_FILESYSTEM_FORCE=OFF -DNANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON
   - make
   - cd ..
   - mv -v bin/ nana-demo/

CMakeLists.txt

@@ -5,6 +5,14 @@
 #   Robert Hauck - Enable support for PNG/Freetype
 #   Qiangqiang Wu - Add biicode support
 #   Ariel Vina-Rodriguez (qPCR4vir) 
+#
+# Nana uses some build systems: MS-VS solution, MAKE, bakefile, codeblock, etc. manually optimized.
+# In the future CMake could be the prefered, and maybe will be used to generate the others and the central nana repo
+# will distribute all of them. But by now CMake is just one of them and all the other distributed build system
+# files/projects are manually write. This current CMakeList.txt reflect this fact and that is why we don't
+# generate here configurated *.h files or explicitly enumerate the sources files: anyway this CM-list
+# will be "touched" to force a re-run of cmake.
+
 
 #https://cmake.org/cmake-tutorial/
 #https://cmake.org/cmake/help/v3.3/module/CMakeDependentOption.html?highlight=cmakedependentoption
@@ -13,11 +21,11 @@
 
 #  It seems that project() defines essential system variables like CMAKE_FIND_LIBRARY_PREFIXES.
 #  https://bbs.archlinux.org/viewtopic.php?id=84967
+
+
 project(nana)
 cmake_minimum_required(VERSION 2.8)
 
-set(NANA_LINKS)
-
 option(NANA_CMAKE_INSTALL_INCLUDES "Install nana includes when compile the library" ON)
 option(NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ "replaced boost.thread with meganz's mingw-std-threads." OFF)
 option(NANA_CMAKE_ENABLE_PNG "Enable the use of PNG" OFF)
@@ -25,9 +33,9 @@ option(NANA_CMAKE_LIBPNG_FROM_OS "Use libpng from operating system." ON)
 option(NANA_CMAKE_ENABLE_JPEG "Enable the use of JPEG" OFF)
 option(NANA_CMAKE_LIBJPEG_FROM_OS "Use libjpeg from operating system." ON)
 option(NANA_CMAKE_ENABLE_AUDIO "Enable class audio::play for PCM playback." OFF)
-option(NANA_CMAKE_VERBOSE_PREPROCESSOR "Show annoying debug messages during compilation." OFF)
+option(NANA_CMAKE_VERBOSE_PREPROCESSOR "Show annoying debug messages during compilation." ON)
 option(NANA_CMAKE_STOP_VERBOSE_PREPROCESSOR "Stop compilation after showing the annoying debug messages." ON)
-option(NANA_CMAKE_BUILD_DEMOS "Build all the demos form the nana_demo repository." OFF)
+option(NANA_CMAKE_BUILD_DEMOS "Build all the demos form the nana_demo repository." ON)
 option(NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS "" ON)
 option(NANA_CMAKE_AUTOMATIC_GUI_TESTING "Activate automatic GUI testing?" OFF)
 option(NANA_CMAKE_BUILD_FreeMe "Build FreeMe (currently broken)?" OFF)
@@ -53,51 +61,30 @@ option(NANA_CMAKE_BOOST_FILESYSTEM_FORCE "Force use of Boost filesystem if avail
 #option(NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT "Where to find <boost/filesystem.hpp>?" "../")
 #option(NANA_CMAKE_BOOST_FILESYSTEM_LIB "Flag for the compiler to link: " "-lboost/fs")
 #include_directories("${NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT}")
-#list(APPEND NANA_LINKS "${NANA_CMAKE_BOOST_FILESYSTEM_LIB}" )
+#set(NANA_LINKS "${NANA_LINKS} ${NANA_CMAKE_BOOST_FILESYSTEM_LIB}")
-
-
-if (NANA_CMAKE_NANA_FILESYSTEM_FORCE)
-    add_definitions(-DNANA_FILESYSTEM_FORCE)
-	
-elseif (NANA_CMAKE_STD_FILESYSTEM_FORCE)
-    add_definitions(-DSTD_FILESYSTEM_FORCE)
-	
-elseif (NANA_CMAKE_FIND_BOOST_FILESYSTEM OR NANA_CMAKE_BOOST_FILESYSTEM_FORCE)
-
-	if (NANA_CMAKE_BOOST_FILESYSTEM_FORCE)
-        add_definitions(-DNANA_BOOST_FILESYSTEM_FORCE)
-	endif(NANA_CMAKE_BOOST_FILESYSTEM_FORCE)
-	
-    # https://cmake.org/cmake/help/git-master/module/FindBoost.html
-	# Implicit dependencies such as Boost::filesystem requiring Boost::system will be automatically detected and satisfied, 
-	# even if system is not specified when using find_package and if Boost::system is not added to target_link_libraries. 
-	# If using Boost::thread, then Thread::Thread will also be added automatically.
-    find_package(Boost COMPONENTS filesystem)
-	if (Boost_FOUND)
-        add_definitions(-DNANA_BOOST_FILESYSTEM_AVAILABLE)
-		include_directories(SYSTEM "${Boost_INCLUDE_DIR}")
-		list(APPEND NANA_LINKS "${Boost_LIBRARIES}")
-	endif (Boost_FOUND)
-	
-	set(Boost_USE_STATIC_LIBS ON)
-	set(Boost_USE_STATIC_RUNTIME ON)  # ??
-	#set(Boost_USE_MULTITHREADED ON)
-	
-endif (NANA_CMAKE_NANA_FILESYSTEM_FORCE)
 
 
 
-# Compatibility with CMake 3.1
+
+########### Compatibility with CMake 3.1
 if(POLICY CMP0054)
   # http://www.cmake.org/cmake/help/v3.1/policy/CMP0054.html
   cmake_policy(SET CMP0054 OLD)
 endif()
 
+if(POLICY CMP0004)    # ignore leading space
+  # http://www.cmake.org/cmake/help/v3.0/policy/CMP0004.html
+  cmake_policy(SET CMP0004 OLD)
+endif()
+
 add_definitions(-DNANA_IGNORE_CONF)
 
+
+########### OS
+
 if(WIN32)
     add_definitions(-DWIN32)
-    set(BUILD_FreeMe ON)  #"Build FreeMe only on Windows."
+    # set(BUILD_FreeMe ON)  #"Build FreeMe only on Windows."
     #Global MSVC definitions. You may prefer the hand-tuned sln and projects from the nana repository.
     if(MSVC)
 		option(WIN32_USE_MP "Set to ON to build nana with the /MP option (Visual Studio 2005 and above)." ON)
@@ -118,29 +105,84 @@ endif(WIN32)
 if(APPLE)
     add_definitions(-DAPPLE)
     include_directories(/opt/X11/include/)
-	list(APPEND NANA_LINKS -L/opt/X11/lib/  -liconv)
+    set(NANA_LINKS "${NANA_LINKS} -L/opt/X11/lib/ -liconv")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -liconv")
+    #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/opt/X11/lib/ -liconv")
     set(ENABLE_AUDIO OFF)
 elseif(UNIX)
     add_definitions(-Dlinux)
 	message("added -D linux")
 endif(APPLE)
 
-
-
 if(UNIX)
-    list(APPEND NANA_LINKS -lX11  )
+    set(NANA_LINKS "${NANA_LINKS} -lX11")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lX11")
+    #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lX11")
     find_package(Freetype)
     if (FREETYPE_FOUND)
         include_directories( ${FREETYPE_INCLUDE_DIRS})
-		list(APPEND NANA_LINKS  -lXft )
+        #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lXft")
+        #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lXft")
+        set(NANA_LINKS "${NANA_LINKS} -lXft")  
     endif(FREETYPE_FOUND)
 endif(UNIX)
 
+
+########### Compliers
+#
+# Using gcc: gcc 4.8 don't sopourt C++14 and make_unique. You may want to update at least to 4.9.
+# In Windows, the gcc which come with CLion was 4.8 from MinGW. You may want to install MinGW-w64 from the
+# TDM-GCC Compiler Suite for Windows which will update you to gcc 5.1.
+# gcc 5.3 and 5.4 include filesytem, but you need to add the link flag: -lstdc++fs
+#
+# see at end of:  https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dynamic_or_shared.html
+
+# set compile  flags
+if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")    # Clang || GNU
+
+    if  ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+	 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -Wall")       # Clang
+	
+    else ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14  -Wall")       # GNU 
+          
+    endif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+
+endif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+
+# enable static linkage
+if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT MINGW)    # GNU || CLang not MinGW
+    #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++  -pthread")
+    
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3)
+	                                                                     # IS_GNUCXX < 5.3
+    else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3)
+       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++fs")    # IS_GNUCXX 5.3 or more
+       set(NANA_LINKS "${NANA_LINKS} -lstdc++fs") 
+    endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3)
+    
+endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT MINGW)
+
+
+if (APPLE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")                    # APPLE Clang
+  set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++")
+endif ()
+
+# set (CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
+
+
+
+
+############# Optional libraries
+
 #Find PNG
 if(NANA_CMAKE_ENABLE_PNG)
     add_definitions(-DNANA_ENABLE_PNG)
     #set(NANA_PNG_LIB "png")
-	list(APPEND NANA_LINKS   -lpng )	
+    set(NANA_LINKS "${NANA_LINKS} -lpng")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lpng")
+    #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpng")
     if(NANA_CMAKE_LIBPNG_FROM_OS)
         find_package(PNG)
         if (PNG_FOUND)
@@ -154,7 +196,9 @@ endif(NANA_CMAKE_ENABLE_PNG)
 if(NANA_CMAKE_ENABLE_JPEG)
     add_definitions(-DNANA_ENABLE_JPEG)
     #set(NANA_JPEG_LIB "jpeg")
-	list(APPEND NANA_LINKS   -ljpeg )	
+    set(NANA_LINKS "${NANA_LINKS} -ljpeg")
+    # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ljpeg")
+    #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ljpeg")
     if(NANA_CMAKE_LIBJPEG_FROM_OS)
         find_package(JPEG)
         if (JPEG_FOUND)
@@ -170,13 +214,48 @@ if(NANA_CMAKE_ENABLE_AUDIO)
         find_package(ASOUND)
         if (ASOUND_FOUND)
             include_directories( ${ASOUND_INCLUDE_DIRS})
-	        list(APPEND NANA_LINKS   -lasound )				
+	        set(NANA_LINKS "${NANA_LINKS}  -lasound")
+            # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -lasound")
+            #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasound")
         else(ASOUND_FOUND)
             message(FATAL_ERROR "libasound is not found")
         endif(ASOUND_FOUND)
     endif(UNIX)
 endif(NANA_CMAKE_ENABLE_AUDIO)
 
+if (NANA_CMAKE_NANA_FILESYSTEM_FORCE)
+    add_definitions(-DNANA_FILESYSTEM_FORCE)
+	
+elseif (NANA_CMAKE_STD_FILESYSTEM_FORCE)
+    add_definitions(-DSTD_FILESYSTEM_FORCE)
+	
+elseif (NANA_CMAKE_FIND_BOOST_FILESYSTEM OR NANA_CMAKE_BOOST_FILESYSTEM_FORCE)
+
+	if (NANA_CMAKE_BOOST_FILESYSTEM_FORCE)
+        add_definitions(-DNANA_BOOST_FILESYSTEM_FORCE)
+	endif(NANA_CMAKE_BOOST_FILESYSTEM_FORCE)
+	
+    # https://cmake.org/cmake/help/git-master/module/FindBoost.html
+	# Implicit dependencies such as Boost::filesystem requiring Boost::system will be automatically detected and satisfied, 
+	# even if system is not specified when using find_package and if Boost::system is not added to target_link_libraries. 
+	# If using Boost::thread, then Thread::Thread will also be added automatically.
+    find_package(Boost COMPONENTS filesystem)
+	if (Boost_FOUND)
+      add_definitions(-DNANA_BOOST_FILESYSTEM_AVAILABLE)
+	  include_directories(SYSTEM "${Boost_INCLUDE_DIR}")
+	  #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${Boost_LIBRARIES}")
+	  set(NANA_LINKS "${NANA_LINKS} ${Boost_LIBRARIES}")    ######  FIRST !!!!!!!!!!!!!!!!!    add   is not first
+	  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Boost_LIBRARIES}")
+	endif (Boost_FOUND)
+	
+	set(Boost_USE_STATIC_LIBS ON)
+	set(Boost_USE_STATIC_RUNTIME ON)  # ??
+	#set(Boost_USE_MULTITHREADED ON)
+	
+endif (NANA_CMAKE_NANA_FILESYSTEM_FORCE)
+
+
+
 if(NANA_CMAKE_VERBOSE_PREPROCESSOR)
     add_definitions(-DVERBOSE_PREPROCESSOR)
 endif(NANA_CMAKE_VERBOSE_PREPROCESSOR)
@@ -185,43 +264,39 @@ endif(NANA_CMAKE_VERBOSE_PREPROCESSOR)
 set(NANA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/source)
 set(NANA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-include_directories(${NANA_INCLUDE_DIR})
+# collect all source sub-directories in a list to avoid duplication here
-aux_source_directory(${NANA_SOURCE_DIR} NANA_SOURCE)
+set(NANA_SOURCE_SUBDIRS /.
-aux_source_directory(${NANA_SOURCE_DIR}/detail NANA_DETAIL_SOURCE)
+                        /detail
-aux_source_directory(${NANA_SOURCE_DIR}/filesystem NANA_FILESYSTEM_SOURCE)
+                        /filesystem
-aux_source_directory(${NANA_SOURCE_DIR}/gui NANA_GUI_SOURCE)
+                        /gui
-aux_source_directory(${NANA_SOURCE_DIR}/gui/detail NANA_GUI_DETAIL_SOURCE)
+                        /gui/detail
-aux_source_directory(${NANA_SOURCE_DIR}/gui/widgets NANA_GUI_WIDGETS_SOURCE)
+                        /gui/widgets
-aux_source_directory(${NANA_SOURCE_DIR}/gui/widgets/skeletons NANA_GUI_WIDGETS_SKELETONS_SOURCE)
+                        /gui/widgets/skeletons
-aux_source_directory(${NANA_SOURCE_DIR}/paint NANA_PAINT_SOURCE)
+                        /paint
-aux_source_directory(${NANA_SOURCE_DIR}/paint/detail NANA_PAINT_DETAIL_SOURCE)
+                        /paint/detail
-aux_source_directory(${NANA_SOURCE_DIR}/system NANA_SYSTEM_SOURCE)
+                        /system
-aux_source_directory(${NANA_SOURCE_DIR}/threads NANA_THREADS_SOURCE)
+                        /threads      )
 if(NANA_CMAKE_ENABLE_AUDIO)
-    aux_source_directory(${NANA_SOURCE_DIR}/audio NANA_AUDIO_SOURCE)
+    list(APPEND NANA_SOURCE_SUBDIRS
-    aux_source_directory(${NANA_SOURCE_DIR}/audio/detail NANA_AUDIO_DETAIL_SOURCE)
+                        /audio
+                        /audio/detail  )
 endif()
 
-#To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library
+# collect all source files in the source-sub-dir
-#and Use SOURCE_GROUP if all your sources are in the same directory
+#To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library
+#and Use SOURCE_GROUP if all your sources are in the same directory
+foreach(subdir ${NANA_SOURCE_SUBDIRS})
+    aux_source_directory(${NANA_SOURCE_DIR}${subdir} sources)
+    # message("Subir:  ${subdir}")
+    # message("Files:  ${sources}")
+endforeach(subdir ${NANA_SOURCE_SUBDIRS})
 
-add_library(${PROJECT_NAME} ${NANA_SOURCE}
+include_directories(${NANA_INCLUDE_DIR})
-                            ${NANA_DETAIL_SOURCE}
+add_library(${PROJECT_NAME} ${sources} )
-                            ${NANA_FILESYSTEM_SOURCE}
+target_link_libraries(${PROJECT_NAME} ${NANA_LINKS}) 
-                            ${NANA_AUDIO_SOURCE}
-                            ${NANA_AUDIO_DETAIL_SOURCE}
-                            ${NANA_GUI_SOURCE}
-                            ${NANA_GUI_DETAIL_SOURCE}
-                            ${NANA_GUI_WIDGETS_SOURCE}
-                            ${NANA_GUI_WIDGETS_SKELETONS_SOURCE}
-                            ${NANA_PAINT_SOURCE}
-                            ${NANA_PAINT_DETAIL_SOURCE}
-                            ${NANA_SYSTEM_SOURCE}
-                            ${NANA_THREADS_SOURCE})    
 
-    #  Headers: use INCLUDE_DIRECTORIES
+ #  Headers: use INCLUDE_DIRECTORIES
-    #  Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES)
+ #  Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES)
-    target_link_libraries(${PROJECT_NAME} ${NANA_LINKS})
 
                  
 install(TARGETS ${PROJECT_NAME}
@@ -250,7 +325,7 @@ if (NANA_CMAKE_BUILD_DEMOS)
     foreach ( demo ${demos})
         add_executable(${demo} "../nana-demo/${demo}.cpp")
         set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
-        target_link_libraries(${demo} ${PROJECT_NAME})
+        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})
@@ -262,19 +337,19 @@ if (NANA_CMAKE_BUILD_DEMOS)
 
     set (demos    widget_show widget_show2      )
 
-if (NANA_CMAKE_BUILD_FreeMe)
+    #if (NANA_CMAKE_BUILD_FreeMe)
-    add_definitions(-DBUILD_FreeMe)
+      # add_definitions(-DBUILD_FreeMe)
-endif (NANA_CMAKE_BUILD_FreeMe)
+    #endif (NANA_CMAKE_BUILD_FreeMe)
 
-    if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
+    # if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
-        list(APPEND demos  FreeMe)    # ??
+    #    list(APPEND demos  )    # ?? FreeMe
-    endif (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
+    # 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})
+        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})
@@ -292,7 +367,7 @@ endif (NANA_CMAKE_BUILD_FreeMe)
     foreach ( demo ${demos})
         add_executable(${demo} "../nana-demo/Examples/${demo}.cpp")
         set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
-        target_link_libraries(${demo} ${PROJECT_NAME})
+        target_link_libraries(${demo} ${PROJECT_NAME})                  # ${NANA_LINKS} or ${CMAKE_EXE_LINKER_FLAGS} 
         install(TARGETS ${demo} RUNTIME DESTINATION  "../nana-demo/Examples/")
         message("... to build: ../nana-demo/Examples/${demo}.cpp" )
     endforeach( demo ${demos})
@@ -301,35 +376,16 @@ endif (NANA_CMAKE_BUILD_FreeMe)
 endif (NANA_CMAKE_BUILD_DEMOS)
 
 
-# set compile  flags
-if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall")
-	else("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall")
-	endif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-
-endif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-
-    # enable static linkage  
-    if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT MINGW)
-      #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-      set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++  -pthread")
-	     
-    endif ()
-
-    if (APPLE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-      set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++")
-    endif ()
 
 message ( "CMAKE_CXX_COMPILER_ID   = "  ${CMAKE_CXX_COMPILER_ID})
 message ( "COMPILER_IS_CLANG       = "  ${COMPILER_IS_CLANG})
-message ( "CMAKE_CXX_FLAGS         = "  ${CMAKE_CXX_FLAGS})
 message ( "CMAKE_COMPILER_IS_GNUCXX= "  ${CMAKE_COMPILER_IS_GNUCXX})
+message ( "CMAKE_CXX_FLAGS         = "  ${CMAKE_CXX_FLAGS})
 message ( "CMAKE_EXE_LINKER_FLAGS  = "  ${CMAKE_EXE_LINKER_FLAGS})
+message ( "CMAKE_STATIC_LINKER_FLAGS= "  ${CMAKE_STATIC_LINKER_FLAGS})
+message ( "NANA_LINKS              = "  ${NANA_LINKS})
 message ( "DESTDIR                 = "  ${DESTDIR})
 message ( "CMAKE_INSTALL_PREFIX    = "  ${CMAKE_INSTALL_PREFIX})
-message ( "NANA_LINKS              = "  ${NANA_LINKS})
 message ( "NANA_CMAKE_ENABLE_AUDIO = "  ${NANA_CMAKE_ENABLE_AUDIO})
 message ( "NANA_CMAKE_FIND_BOOST_FILESYSTEM         = "  ${NANA_CMAKE_FIND_BOOST_FILESYSTEM})
 message ( "NANA_CMAKE_BOOST_FILESYSTEM_FORCE        = "  ${NANA_CMAKE_BOOST_FILESYSTEM_FORCE})

include/nana/c++defines.hpp

@@ -35,7 +35,10 @@
  *	- STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED  (MinGW with GCC < 4.8.1)
  *	- STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED (MinGW with GCC < 4.8.1)
  *	- STD_TO_STRING_NOT_SUPPORTED (MinGW with GCC < 4.8)
- */
+ *	- STD_FILESYSTEM_NOT_SUPPORTED (GCC < 5.3) ....
+ *	- CXX_NO_INLINE_NAMESPACE (Visual C++ < 2015)
+ *	- STD_MAKE_UNIQUE_NOT_SUPPORTED (GCC < 4.9)
+  */
 
 #ifndef NANA_CXX_DEFINES_INCLUDED
 #define NANA_CXX_DEFINES_INCLUDED
@@ -50,7 +53,7 @@
 #
 #		define CXX_NO_INLINE_NAMESPACE //no support of C++11 inline namespace until Visual C++ 2015
 #		define noexcept		//no support of noexcept until Visual C++ 2015
-#		define constexpr	//no support of constexpr until Visual C++ 2015
+#		define constexpr const	//no support of constexpr until Visual C++ 2015 ? const ??
 #	endif
 #elif defined(__GNUC__)
 #	if (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
@@ -141,6 +144,7 @@
 
 	#if ((__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3 ) ) )
 	#	undef STD_FILESYSTEM_NOT_SUPPORTED
+    /// \todo define the namespace ????
 	#endif
 
 	#if (__GNUC__ == 4)

include/nana/config.hpp

@@ -109,7 +109,7 @@
 #endif
 
 #if !defined(STOP_VERBOSE_PREPROCESSOR)
-#define STOP_VERBOSE_PREPROCESSOR
+//#define STOP_VERBOSE_PREPROCESSOR
 #endif
 
 #endif  // NANA_IGNORE_CONFIG

include/nana/deploy.hpp

@@ -17,9 +17,7 @@
 #include <nana/push_ignore_diagnostic>
 
 #include <nana/config.hpp>
-#if defined(VERBOSE_PREPROCESSOR)
+
-	#include <nana/verbose_preprocessor.hpp>
-#endif
 
 #include <stdexcept>
 #include <nana/charset.hpp>

include/nana/filesystem/filesystem_selector.hpp

@@ -29,6 +29,10 @@
 
 #include <nana/config.hpp>
 
+#define NANA_USING_NANA_FILESYSTEM  false
+#define NANA_USING_STD_FILESYSTEM   false
+#define NANA_USING_BOOST_FILESYSTEM false
+
 #if (defined(NANA_FILESYSTEM_FORCE) || ( (defined(STD_FILESYSTEM_NOT_SUPPORTED) && !defined(BOOST_FILESYSTEM_AVAILABLE)) && !(defined(BOOST_FILESYSTEM_FORCE) || defined(STD_FILESYSTEM_FORCE)) ) )
 
 #   include <nana/filesystem/filesystem.hpp>
@@ -42,7 +46,8 @@ namespace std {
 #       else
 			using namespace nana::experimental::filesystem::v1;
 #       endif
-
+#undef  NANA_USING_NANA_FILESYSTEM 
+#define NANA_USING_NANA_FILESYSTEM  true		
 		} // filesystem
 	} // experimental
 } // std
@@ -56,12 +61,16 @@ namespace std {
 	namespace experimental {
 		namespace filesystem {
                   using namespace boost::filesystem;
+#undef  NANA_USING_BOOST_FILESYSTEM
+#define NANA_USING_BOOST_FILESYSTEM true
 		} // filesystem
 	} // experimental
 } // std
 
 #else
 #    include <experimental/filesystem>
+#undef NANA_USING_STD_FILESYSTEM 
+#define NANA_USING_STD_FILESYSTEM true
 #endif
 
 #ifndef __cpp_lib_experimental_filesystem

include/nana/verbose_preprocessor.hpp

@@ -11,8 +11,8 @@
  *
  *	@brief    show the values of configuration constants during compilation to facilitate build debugging.
  *
- *	Set VERBOSE_PREPROCESSOR to 1 to show the messages or to 0 for a normal build.
+ *	Define VERBOSE_PREPROCESSOR to show the messages or undefine for a normal build.
- *	Normally set to 0. Set to 1 only in case you want to debug the build system because it is extremely repetitive and slow.
+ *	Normally undefined. Define in case you want to debug the build system.
  *
  *  @authors  Ariel Vina-Rodriguez (qPCR4vir)
  *
@@ -25,25 +25,107 @@
 
 #if defined(VERBOSE_PREPROCESSOR)
 
+    #include <nana/config.hpp>
+    #include <nana/deploy.hpp>
+
+
+
     #define STRING2(x) #x
 	#define STRING(x) STRING2(x)
-	#pragma message ( "\nVerbose preprocessor =" STRING(VERBOSE_PREPROCESSOR)" , \n STOP_VERBOSE_PREPROCESSOR=" STRING(STOP_VERBOSE_PREPROCESSOR)  )
+    #define SHOW_VALUE(x) " " #x "  =  " STRING2(x) 
 
-	#pragma message ( "\nWindows: \n _WIN32=" STRING(_WIN32) ", \n __WIN32__ =" STRING(__WIN32__) " , \n WIN32=" STRING(WIN32)" , \n NANA_WINDOWS=" STRING(NANA_WINDOWS)   )
+	#pragma message ( "\n -----> Verbose preprocessor"  )
+	#pragma message (  SHOW_VALUE(VERBOSE_PREPROCESSOR)  )
+	#pragma message (  SHOW_VALUE(STOP_VERBOSE_PREPROCESSOR)  )
 
-	#pragma message ( "\nUNICODE: \n NANA_UNICODE=" STRING(NANA_UNICODE) ", \n _UNICODE =" STRING(_UNICODE) " , \n UNICODE=" STRING(UNICODE)  )
+	#pragma message ( "\n -----> OS: \n   --Windows: "    )
+    #pragma message (  SHOW_VALUE(_WIN32)  )
+    #pragma message (  SHOW_VALUE(__WIN32__)  )
+    #pragma message (  SHOW_VALUE(WIN32)  )
+	#pragma message (  SHOW_VALUE(NANA_WINDOWS)  )
 
-	#pragma message ( "\nMinGW: \n __MINGW32__=" STRING(__MINGW32__) ", \n __MINGW64__=" STRING(__MINGW64__) " , \n MINGW=" STRING(MINGW) )
+	#pragma message ( "\n   ---NIX: "  )
+	#pragma message (  SHOW_VALUE(NANA_LINUX)  )
+	#pragma message (  SHOW_VALUE(NANA_POSIX)  )
+	#pragma message (  SHOW_VALUE(NANA_X11)  )
+	#pragma message (  SHOW_VALUE(APPLE)  )
+	#pragma message (  SHOW_VALUE(NANA_IGNORE_CONF)  )
 
-	#pragma message ( "\nGNU: \n __GNUC__=" STRING(__GNUC__) ", \n __GNUC_MINOR__=" STRING(__GNUC_MINOR__) " , \n __GNUC_PATCHLEVEL__=" STRING(__GNUC_PATCHLEVEL__) )
 
-    #pragma message ( "\nSTD: \nSTD_CODECVT_NOT_SUPPORTED=" STRING(STD_CODECVT_NOT_SUPPORTED) " , \nSTD_THREAD_NOT_SUPPORTED=" STRING(STD_THREAD_NOT_SUPPORTED) )
+	#pragma message ( "\n -----> Compilers: \n  MinGW: "  )
+	#pragma message (  SHOW_VALUE(__MINGW32__)  )
+	#pragma message (  SHOW_VALUE(__MINGW64__)  )
+	#pragma message (  SHOW_VALUE(MINGW)  )
 
-	#pragma message ( "\nSTD: \nUSE_github_com_meganz_mingw_std_threads=" STRING(USE_github_com_meganz_mingw_std_threads) " , \nSTD_THREAD_NOT_SUPPORTED=" STRING(STD_THREAD_NOT_SUPPORTED) )
+	#pragma message ( "\n  ---MSC: " )
+	#pragma message (  SHOW_VALUE(_MSC_VER)     )
+	#pragma message (  SHOW_VALUE(_MSC_FULL_VER)  )
 
-	#pragma message ( "\nClang compiler: \n__clang__=" STRING(__clang__)  ", \n__GLIBCPP__=" STRING(__GLIBCPP__) " , \n__GLIBCXX__=" STRING(__GLIBCXX__) )
+	#pragma message ( "\n  ---GNU: " )
+	#pragma message (  SHOW_VALUE(__GNUC__)  )
+	#pragma message (  SHOW_VALUE(__GNUC_MINOR__)  )
+	#pragma message (  SHOW_VALUE(__GNUC_PATCHLEVEL__)  )
 
-	#pragma message ( "\nMSC: \n_MSC_VER=" STRING(_MSC_VER) ", \n_MSC_FULL_VER=" STRING(_MSC_FULL_VER ) )
+	#pragma message ( "\n  ---Clang compiler: " )
+	#pragma message (  SHOW_VALUE(__clang__)  )
+	#pragma message (  SHOW_VALUE(__GLIBCPP__)  )
+	#pragma message (  SHOW_VALUE(__GLIBCXX__)  )
+
+    #pragma message ( "\n -----> STD:  " )
+	#pragma message (  SHOW_VALUE(STD_CODECVT_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(STD_THREAD_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(STD_TO_STRING_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(STD_TO_WSTRING_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(USE_github_com_meganz_mingw_std_threads)  )
+	#pragma message (  SHOW_VALUE(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)  )
+	#pragma message (  SHOW_VALUE(STD_THREAD_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(STD_put_time_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(STD_MAKE_UNIQUE_NOT_SUPPORTED)  )
+
+	#pragma message (  SHOW_VALUE(STD_FILESYSTEM_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(BOOST_FILESYSTEM_AVAILABLE)  )
+	#pragma message (  SHOW_VALUE(BOOST_FILESYSTEM_FORCE)  )
+	#pragma message (  SHOW_VALUE(STD_FILESYSTEM_FORCE)  )
+	#pragma message (  SHOW_VALUE(NANA_FILESYSTEM_FORCE)  )
+	#pragma message (  SHOW_VALUE(CXX_NO_INLINE_NAMESPACE)  )
+	//#pragma message (  SHOW_VALUE(__has_include)  )
+	#pragma message (  SHOW_VALUE(__cpp_lib_experimental_filesystem)  )
+	#pragma message (  SHOW_VALUE(NANA_USING_NANA_FILESYSTEM)  )
+	#pragma message (  SHOW_VALUE(NANA_USING_STD_FILESYSTEM)  )
+	#pragma message (  SHOW_VALUE(NANA_USING_BOOST_FILESYSTEM)  )
+
+    #pragma message ( "\n#include <nana/filesystem/filesystem_selector.hpp> " )
+    #include <nana/filesystem/filesystem_selector.hpp>
+
+	#pragma message (  SHOW_VALUE(STD_MAKE_UNIQUE_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(STD_FILESYSTEM_NOT_SUPPORTED)  )
+	#pragma message (  SHOW_VALUE(BOOST_FILESYSTEM_AVAILABLE)  )
+	#pragma message (  SHOW_VALUE(BOOST_FILESYSTEM_FORCE)  )
+	#pragma message (  SHOW_VALUE(STD_FILESYSTEM_FORCE)  )
+	#pragma message (  SHOW_VALUE(NANA_FILESYSTEM_FORCE)  )
+	#pragma message (  SHOW_VALUE(CXX_NO_INLINE_NAMESPACE)  )
+	//#pragma message (  SHOW_VALUE(__has_include)  )
+	#pragma message (  SHOW_VALUE(__cpp_lib_experimental_filesystem)  )
+	#pragma message (  SHOW_VALUE(NANA_USING_NANA_FILESYSTEM)  )
+	#pragma message (  SHOW_VALUE(NANA_USING_STD_FILESYSTEM)  )
+	#pragma message (  SHOW_VALUE(NANA_USING_BOOST_FILESYSTEM)  )
+
+	#pragma message (  SHOW_VALUE(NANA_UNICODE)  )
+	#pragma message (  SHOW_VALUE(_UNICODE)  )
+	#pragma message (  SHOW_VALUE(UNICODE)  )
+
+    #pragma message ( "\n -----> Libraries: " )
+	#pragma message (  SHOW_VALUE(NANA_ENABLE_AUDIO)  )
+	#pragma message (  SHOW_VALUE(NANA_ENABLE_PNG)  )
+	#pragma message (  SHOW_VALUE(USE_LIBPNG_FROM_OS)  )
+	#pragma message (  SHOW_VALUE(NANA_LIBPNG)  )
+	#pragma message (  SHOW_VALUE(NANA_ENABLE_JPEG)  )
+	#pragma message (  SHOW_VALUE(USE_LIBJPEG_FROM_OS)  )
+	#pragma message (  SHOW_VALUE(NANA_LIBJPEG)  )
+
+   
+   // #pragma message ( "\n =" STRING() ", \n =" STRING()"  , \n =" STRING() )
 
     #if defined(STOP_VERBOSE_PREPROCESSOR)
         #error ("\nCompilation stopped to avoid annoying messages")
@@ -52,5 +134,4 @@
 #endif // VERBOSE_PREPROCESSOR
 
 
-
 #endif //NANA_VERBOSE_PREPROCESSOR_H

source/deploy.cpp

@@ -702,3 +702,6 @@ namespace nana
 
 }
 
+#if defined(VERBOSE_PREPROCESSOR)
+#	include <nana/verbose_preprocessor.hpp>
+#endif

source/detail/platform_spec_windows.cpp

@@ -9,7 +9,7 @@
  *
  *	@file: nana/detail/platform_spec.cpp
  *
- *	@brief basis classes and data structrues required by nana
+ *	@brief basis classes and data structures required by nana
  */
 
 #include <nana/detail/platform_spec_selector.hpp>