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 /Tests | |
| 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 'Tests')
| -rw-r--r-- | Tests/UseWX/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/UseWX/WX.cxx | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Tests/UseWX/CMakeLists.txt b/Tests/UseWX/CMakeLists.txt index 139339a..ac997ff 100644 --- a/Tests/UseWX/CMakeLists.txt +++ b/Tests/UseWX/CMakeLists.txt @@ -1,9 +1,7 @@ -PROJECT (UsewxWindows) +PROJECT (UsewxWidgets) -INCLUDE( ${CMAKE_ROOT}/Modules/Use_wxWindows.cmake) +FIND_PACKAGE(wxWidgets REQUIRED) +INCLUDE( ${wxWidgets_USE_FILE} ) ADD_EXECUTABLE (UseWX WIN32 WX.cxx) - -#TODO: -#- dll linking is not working on WIN32, need to '-DWXUSINGDLL' to preprocessor - +TARGET_LINK_LIBRARIES(UseWX ${wxWidgets_LIBRARIES} ) diff --git a/Tests/UseWX/WX.cxx b/Tests/UseWX/WX.cxx index 69717bb..d463127 100644 --- a/Tests/UseWX/WX.cxx +++ b/Tests/UseWX/WX.cxx @@ -51,9 +51,13 @@ bool MyApp::OnInit() //Testing if link to wx debug library #ifdef __WXDEBUG__ - printf("If you read this you're in debug mode.\n"); + printf("If you read this you're in __WXDEBUG__ debug mode.\n"); #endif //__WXDEBUG__ +#ifdef _DEBUG + printf("If you read this then _DEBUG is defined.\n"); +#endif //_DEBUG + wxChar ch = wxT('*'); wxString s = wxT("Hello, world!"); int len = s.Len(); |