From 26790ad93ba80f109c9033525c2ff5ac08d883bb Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 28 Apr 2016 10:20:40 -0400
Subject: Tests: Add workaround to Wrapping test for Watcom failure

The Watcom tools do not seem to like our wrapFLTK executable
to mix C and C++ sources.  Work around this by using C++ for
both sources.
---
 Tests/Wrapping/CMakeLists.txt | 2 +-
 Tests/Wrapping/wrapFLTK.c     | 1 -
 Tests/Wrapping/wrapFLTK.cxx   | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 Tests/Wrapping/wrapFLTK.c
 create mode 100644 Tests/Wrapping/wrapFLTK.cxx

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.c
deleted file mode 100644
index 78f2de1..0000000
--- a/Tests/Wrapping/wrapFLTK.c
+++ /dev/null
@@ -1 +0,0 @@
-int main(void) { return 0; }
diff --git a/Tests/Wrapping/wrapFLTK.cxx b/Tests/Wrapping/wrapFLTK.cxx
new file mode 100644
index 0000000..78f2de1
--- /dev/null
+++ b/Tests/Wrapping/wrapFLTK.cxx
@@ -0,0 +1 @@
+int main(void) { return 0; }
-- 
cgit v0.12


From 47c298851bb172af1c5afd208fa62524d763f91a Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 29 Apr 2016 11:47:35 -0400
Subject: Tests: Fix RunCMake.BuildDepends filesystem delay for Watcom WMake

Our 1.125s delay does not seem to be long enough to be reliable with
the Watcom `wmake` tool.  Use a longer delay for Watcom.
---
 Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
cgit v0.12