summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2003-10-16 23:15:44 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2003-10-16 23:15:44 (GMT)
commit27476dabd91bf30720b35e412457a945abf4cbab (patch)
tree9efeef82ae5bbeceb1915facedb2eed9694bd3df
parent296e73180844791bf1a8ec51dad489625ca8c9f3 (diff)
downloadCMake-27476dabd91bf30720b35e412457a945abf4cbab.zip
CMake-27476dabd91bf30720b35e412457a945abf4cbab.tar.gz
CMake-27476dabd91bf30720b35e412457a945abf4cbab.tar.bz2
ENH: Enable test on windows
-rw-r--r--Source/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 3053f6a..3585125 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -361,7 +361,7 @@ IF(BUILD_TESTING)
objc++)
ENDIF (APPLE)
- IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)
+ IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
# Will be set if the wxwindows gui is on
ADD_TEST(UseWX ${EXECUTABLE_OUTPUT_PATH}/cmaketest
${CMake_SOURCE_DIR}/Tests/UseWX
@@ -370,7 +370,7 @@ IF(BUILD_TESTING)
${CMake_BINARY_DIR}/Tests/UseWX
UsewxWindows
CMAKE_ARGS -DCMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE:FILEPATH=${CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE})
- ENDIF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)
+ ENDIF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
IF(UNIX)
IF("x${CMAKE_INSTALL_PREFIX}" MATCHES "^x${CMake_BINARY_DIR}/Tests/TestInstall/Prefix$")