kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Brad King 2016-05-02 09:24:23 -04:00 committed by CMake Topic Stage
parent 067b21b675 47c298851b
commit 24b2a36778
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
View File

@ -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)

2
Tests/Wrapping/CMakeLists.txt
View File

@ -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
Tests/Wrapping/wrapFLTK.c → Tests/Wrapping/wrapFLTK.cxx
View File