[Cmake-commits] CMake branch, next, updated. v3.4.2-2072-g92b073f

[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  92b073f950b7cb5e20f138fb685bc2145b0833b8 (commit)
       via  f98ae28e3dd633126e7897a593f2d15ba68a75d9 (commit)
      from  aa6eaa602a3111415db50cc143534f33f30341cc (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=92b073f950b7cb5e20f138fb685bc2145b0833b8
commit 92b073f950b7cb5e20f138fb685bc2145b0833b8
Merge: aa6eaa6 f98ae28
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 21 13:45:41 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 21 13:45:41 2016 -0500

    Merge topic 'test-fltk_wrap_ui' into next
    
    f98ae28e Tests: Cover fltk_wrap_ui on an executable that links libraries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f98ae28e3dd633126e7897a593f2d15ba68a75d9
commit f98ae28e3dd633126e7897a593f2d15ba68a75d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 21 13:42:46 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 21 13:42:46 2016 -0500

    Tests: Cover fltk_wrap_ui on an executable that links libraries
    
    CMake 3.4 may crash on this case.  The problem seems to have been
    fixed since then, but keep it working by adding a test case now.
    
    Reported-by: Gonzalo Garramuño <ggarra13 at gmail.com>

diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt
index cbb28a1..aca36bc 100644
--- a/Tests/Wrapping/CMakeLists.txt
+++ b/Tests/Wrapping/CMakeLists.txt
@@ -85,16 +85,18 @@ endif ()
 # Since FLTK_FLUID_EXE is supposed to create a .cxx/.h from a .fl/.fld,
 # create an empty one so that the dependencies can be met.
 #
-set (FLTK_SRCS
-  fltk1.fl
-  )
 add_executable(fakefluid fakefluid.cxx)
 set (FLTK_WRAP_UI "On")
 set (FLTK_FLUID_EXECUTABLE fakefluid)
-fltk_wrap_ui (wraplibFLTK ${FLTK_SRCS})
+fltk_wrap_ui (wraplibFLTK fltk1.fl)
 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})
+target_link_libraries(wrapFLTK wraplibFLTK)
+add_dependencies(wrapFLTK fakefluid)
+
 #
 # Mangled Mesa
 #
diff --git a/Tests/Wrapping/fltk2.fl b/Tests/Wrapping/fltk2.fl
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/Wrapping/wrapFLTK.c b/Tests/Wrapping/wrapFLTK.c
new file mode 100644
index 0000000..78f2de1
--- /dev/null
+++ b/Tests/Wrapping/wrapFLTK.c
@@ -0,0 +1 @@
+int main(void) { return 0; }

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

Summary of changes:
 Tests/Wrapping/CMakeLists.txt                                |   10 ++++++----
 .../IntelVSImplicitPath/hello.f => Tests/Wrapping/fltk2.fl   |    0
 .../LinkInterfaceLoop/main.c => Wrapping/wrapFLTK.c}         |    0
 3 files changed, 6 insertions(+), 4 deletions(-)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/Wrapping/fltk2.fl (100%)
 copy Tests/{CMakeOnly/LinkInterfaceLoop/main.c => Wrapping/wrapFLTK.c} (100%)


hooks/post-receive
-- 
CMake