diff -r f2e38d537544 src/CMakeLists.txt
--- a/src/CMakeLists.txt	Tue Sep 29 21:22:17 2015 +0200
+++ b/src/CMakeLists.txt	Wed Sep 30 14:34:39 2015 +0200
@@ -40,16 +40,7 @@
 
 # build gui only if wxWidgets was found
 IF(wxWidgets_FOUND)
-  INCLUDE(${wxWidgets_USE_FILE})
   add_subdirectory(hugin1)
-
-  include_directories( ${CMAKE_SOURCE_DIR}/src/hugin1 )
-  # do we need to define _UNICODE on windows?
-  IF(WIN32)
-    IF ("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
-      ADD_DEFINITIONS("-D_UNICODE")
-    ENDIF("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
-  ENDIF(WIN32)
 ENDIF(wxWidgets_FOUND)
 
 add_subdirectory(hugin_cpfind)
diff -r f2e38d537544 src/hugin1/CMakeLists.txt
--- a/src/hugin1/CMakeLists.txt	Tue Sep 29 21:22:17 2015 +0200
+++ b/src/hugin1/CMakeLists.txt	Wed Sep 30 14:34:39 2015 +0200
@@ -1,26 +1,19 @@
-
 include_directories( ${CMAKE_SOURCE_DIR}/src/hugin1 )
 
-# build gui only if wxWidgets was found
-IF(wxWidgets_FOUND)
-#  INCLUDE(${wxWidgets_USE_FILE})
+INCLUDE(${wxWidgets_USE_FILE})
 
-  # do we need to define _UNICODE on windows?
-  IF(WIN32)
-    IF ("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
-      ADD_DEFINITIONS("-D_UNICODE")
-    ENDIF("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
-  ENDIF(WIN32)
+# do we need to define _UNICODE on windows?
+IF ("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
+  ADD_DEFINITIONS("-D_UNICODE -DUNICODE")
+ENDIF()
 
-  add_subdirectory(base_wx)
-  add_subdirectory(stitch_project)
-  add_subdirectory(icpfind)
-  add_subdirectory(executor)
-  # build  Hugin only if OpenGL was found
-  IF(OPENGL_FOUND)
+add_subdirectory(base_wx)
+add_subdirectory(stitch_project)
+add_subdirectory(icpfind)
+add_subdirectory(executor)
+# build  Hugin only if OpenGL was found
+IF(OPENGL_FOUND)
     add_subdirectory(hugin)
-  ENDIF(OPENGL_FOUND)  
-  add_subdirectory(ptbatcher)
-  add_subdirectory(calibrate_lens)
-ENDIF(wxWidgets_FOUND)
-
+ENDIF(OPENGL_FOUND)  
+add_subdirectory(ptbatcher)
+add_subdirectory(calibrate_lens)