diff options
| author | Brad King <brad.king@kitware.com> | 2006-07-21 19:43:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-07-21 19:43:19 (GMT) |
| commit | 3c9744f406d85a293fc504368d32ba34b5ed3332 (patch) | |
| tree | ae48986833aa8d1aabb369c88e832e769d9ef5af /Source/CMakeLists.txt | |
| parent | b377c8ac725aea5a7b892b830b29fb80355cb097 (diff) | |
| download | CMake-3c9744f406d85a293fc504368d32ba34b5ed3332.zip CMake-3c9744f406d85a293fc504368d32ba34b5ed3332.tar.gz CMake-3c9744f406d85a293fc504368d32ba34b5ed3332.tar.bz2 | |
ENH: Applying patch from bug#3443 to implement FindwxWidgets.cmake properly. It also updates the UseWX test and WXDialog sources to use the new find script.
Diffstat (limited to 'Source/CMakeLists.txt')
| -rw-r--r-- | Source/CMakeLists.txt | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 271f5f9..0535fa9 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -326,11 +326,11 @@ IF(BUILD_MFCDialog) ENDIF(BUILD_MFCDialog) # WX Widgets GUI -OPTION(CMAKE_BUILD_WX_DIALOG "Build wxWidgets dialog for CMake" FALSE) -MARK_AS_ADVANCED(CMAKE_BUILD_WX_DIALOG) -IF(CMAKE_BUILD_WX_DIALOG) +OPTION(BUILD_WXDialog "Build wxWidgets dialog for CMake" FALSE) +MARK_AS_ADVANCED(BUILD_WXDialog) +IF(BUILD_WXDialog) SUBDIRS(WXDialog) -ENDIF(CMAKE_BUILD_WX_DIALOG) +ENDIF(BUILD_WXDialog) # Testing IF (NOT DART_ROOT) @@ -1076,9 +1076,8 @@ IF(BUILD_TESTING) ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW) ENDIF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode") - - IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR) - # Will be set if the wxwindows gui is on + IF(BUILD_WXDialog AND wxWidgets_CONFIG_EXECUTABLE) + # Will be set if the WX gui is on ADD_TEST(UseWX ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/UseWX" @@ -1086,11 +1085,11 @@ IF(BUILD_TESTING) --build-generator ${CMAKE_TEST_GENERATOR} --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-exe-dir ${CMake_BINARY_DIR}/Tests/UseWX - --build-project UsewxWindows - --build-options -DCMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE:FILEPATH=${CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE} + --build-project UsewxWidgets + --build-options -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets_CONFIG_EXECUTABLE} --test-command UseWX ) - ENDIF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR) + ENDIF(BUILD_WXDialog AND wxWidgets_CONFIG_EXECUTABLE) IF(UNIX) STRING(COMPARE EQUAL "${CMAKE_INSTALL_PREFIX}" "${CMake_BINARY_DIR}/Tests/TestShellInstall/Prefix" |