diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-02 13:24:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-02 13:24:23 (GMT) |
| commit | 24b2a36778fd65f7066a964cf9f5d249f8e0f101 (patch) | |
| tree | 68dd08a49bb6b1d958e26c182270e67a2c280404 | |
| parent | 067b21b675bde6ccbb3009fbaaba5efaa78dbea0 (diff) | |
| parent | 47c298851bb172af1c5afd208fa62524d763f91a (diff) | |
| download | CMake-24b2a36778fd65f7066a964cf9f5d249f8e0f101.zip CMake-24b2a36778fd65f7066a964cf9f5d249f8e0f101.tar.gz CMake-24b2a36778fd65f7066a964cf9f5d249f8e0f101.tar.bz2 | |
Merge topic 'test-watcom-workaround'
47c29885 Tests: Fix RunCMake.BuildDepends filesystem delay for Watcom WMake
26790ad9 Tests: Add workaround to Wrapping test for Watcom failure
| -rw-r--r-- | Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 3 | ||||
| -rw-r--r-- | Tests/Wrapping/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Wrapping/wrapFLTK.cxx (renamed from Tests/Wrapping/wrapFLTK.c) | 0 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index 8541070..ffd3ae1 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -1,6 +1,7 @@ include(RunCMake) -if(RunCMake_GENERATOR STREQUAL "Borland Makefiles") +if(RunCMake_GENERATOR STREQUAL "Borland Makefiles" OR + RunCMake_GENERATOR STREQUAL "Watcom WMake") set(fs_delay 3) else() set(fs_delay 1.125) diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt index aca36bc..7d9a4c6 100644 --- a/Tests/Wrapping/CMakeLists.txt +++ b/Tests/Wrapping/CMakeLists.txt @@ -93,7 +93,7 @@ add_library(wraplibFLTK ${wraplibFLTK_FLTK_UI_SRCS}) add_dependencies(wraplibFLTK fakefluid) add_dependencies(fakefluid Wrap) fltk_wrap_ui (wrapFLTK fltk2.fl) -add_executable(wrapFLTK wrapFLTK.c ${wrapFLTK_FLTK_UI_SRCS}) +add_executable(wrapFLTK wrapFLTK.cxx ${wrapFLTK_FLTK_UI_SRCS}) target_link_libraries(wrapFLTK wraplibFLTK) add_dependencies(wrapFLTK fakefluid) diff --git a/Tests/Wrapping/wrapFLTK.c b/Tests/Wrapping/wrapFLTK.cxx index 78f2de1..78f2de1 100644 --- a/Tests/Wrapping/wrapFLTK.c +++ b/Tests/Wrapping/wrapFLTK.cxx |