diff --git a/CMakeLists.txt b/CMakeLists.txt
index 888ed1f1..e620b7e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,8 +352,8 @@ if (NANA_CMAKE_BUILD_DEMOS)
     # Pending:      FreeMe (added but really completely compiled if defined BUILD_FreeMe  )
 	
 	function(set_nana_test dir files)
-		foreach ( test ${files})
-			add_executable(${test} "${dir}${test}.cpp")
+		foreach ( test ${${files}})
+			add_executable(${test} "${${dir}}${test}.cpp")
 			set_property( TARGET ${test} PROPERTY CXX_STANDARD 14 )
 			target_link_libraries(${test} ${PROJECT_NAME})       
 			#if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
@@ -362,8 +362,8 @@ if (NANA_CMAKE_BUILD_DEMOS)
 				#add_test(${test} COMMAND ${test})
 			#endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
 			install(TARGETS ${test} RUNTIME DESTINATION  "../nana-demo/")
-			message("... to build:  ${dir}${test}.cpp" )
-		endforeach( test ${files})
+			message("... to build:  ${${dir}}${test}.cpp" )
+		endforeach( test ${${files}})
 	endfunction(set_nana_test)
 	
 	set_nana_test(demos_dir demos)