diff --git a/Source/WXDialog/CMakeLists.txt b/Source/WXDialog/CMakeLists.txt
index 863345216..ada99ded0 100644
--- a/Source/WXDialog/CMakeLists.txt
+++ b/Source/WXDialog/CMakeLists.txt
@@ -1,7 +1,6 @@
 INCLUDE (${CMAKE_ROOT}/Modules/FindwxWindows.cmake)
 
-IF ( WXWINDOWS_FOUND )
-  INCLUDE(${CMAKE_ROOT}/Modules/Use_wxWindows.cmake)
+IF ( CMAKE_WX_CAN_COMPILE )
 
   SET( WX_SRCS
        cmWXCacheProperty.cxx
@@ -62,12 +61,12 @@ IF ( WXWINDOWS_FOUND )
 
   IF(BUILD_TESTING)
     ADD_TEST(wxCMakeSetupRunTest 
-             ${EXECUTABLE_OUTPUT_PATH}/wxCMakeSetup 
+             ${CMake_BINARY_DIR}/Source/wxCMakeSetup 
              -Q -A:ON -B:${CMake_BINARY_DIR}/Tests/Simple 
              -H:${CMake_SOURCE_DIR}/Tests/Simple)
   ENDIF(BUILD_TESTING)
-ELSE ( WXWINDOWS_FOUND )
+ELSE ( CMAKE_WX_CAN_COMPILE )
 
   MESSAGE("Cannot find wxWindows libraries and/or header files")
 
-ENDIF ( WXWINDOWS_FOUND )
+ENDIF ( CMAKE_WX_CAN_COMPILE )