[Cmake-commits] CMake branch, next, updated. v3.5.2-1133-g15ef028

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  15ef0289c2c27eb78c2e4f42f9c7baa000709a05 (commit)
       via  26790ad93ba80f109c9033525c2ff5ac08d883bb (commit)
      from  f7438956bdd78c357f4ed37201abc38143d12887 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15ef0289c2c27eb78c2e4f42f9c7baa000709a05
commit 15ef0289c2c27eb78c2e4f42f9c7baa000709a05
Merge: f743895 26790ad
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 28 10:30:05 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 28 10:30:05 2016 -0400

    Merge topic 'test-watcom-workaround' into next
    
    26790ad9 Tests: Add workaround to Wrapping test for Watcom failure


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26790ad93ba80f109c9033525c2ff5ac08d883bb
commit 26790ad93ba80f109c9033525c2ff5ac08d883bb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 28 10:20:40 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 28 10:20:40 2016 -0400

    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.

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
similarity index 100%
rename from Tests/Wrapping/wrapFLTK.c
rename to Tests/Wrapping/wrapFLTK.cxx

-----------------------------------------------------------------------

Summary of changes:
 Tests/Wrapping/CMakeLists.txt               |    2 +-
 Tests/Wrapping/{wrapFLTK.c => wrapFLTK.cxx} |    0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Tests/Wrapping/{wrapFLTK.c => wrapFLTK.cxx} (100%)


hooks/post-receive
-- 
CMake