diff --git a/CMakeLists.txt b/CMakeLists.txt
index af383c4d..99bd332e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,8 +113,6 @@ if(WIN32)
             add_definitions(-DNANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
         endif(NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
     endif(MINGW)
-elseif(WIN32)
-    set(BUILD_FreeMe OFF) 
 endif(WIN32)
 
 if(APPLE)
@@ -183,6 +181,10 @@ if (NANA_CMAKE_BUILD_FreeMe)
     add_definitions(-DBUILD_FreeMe)
 endif (NANA_CMAKE_BUILD_FreeMe)
 
+if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
+    add_definitions(-DNANA_AUTOMATIC_GUI_TESTING)
+endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
+
 if(NANA_CMAKE_VERBOSE_PREPROCESSOR)
     add_definitions(-DVERBOSE_PREPROCESSOR)
 endif(NANA_CMAKE_VERBOSE_PREPROCESSOR)