Browse Source

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
Brad King 9 years ago
parent
commit
24b2a36778

+ 2 - 1
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)

+ 1 - 1
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)
 

+ 0 - 0
Tests/Wrapping/wrapFLTK.c → Tests/Wrapping/wrapFLTK.cxx