[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-401-g3a087b7

[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  3a087b7b57b8d3625655930b086588cfc14c3829 (commit)
       via  632326a7c762aa039d245a506553c9f06d23cd10 (commit)
       via  2fb8e5b1c46ea586233b19e612ba174aa74d004c (commit)
      from  86d03c32678c016cbd70d911d38439125d08e207 (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=3a087b7b57b8d3625655930b086588cfc14c3829
commit 3a087b7b57b8d3625655930b086588cfc14c3829
Merge: 86d03c3 632326a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 12 08:54:29 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 12 08:54:29 2016 -0400

    Merge topic 'FindSDL-mingw-mwindows' into next
    
    632326a7 FindSDL: Add -mwindows to link flags for MinGW, correct wording
    2fb8e5b1 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=632326a7c762aa039d245a506553c9f06d23cd10
commit 632326a7c762aa039d245a506553c9f06d23cd10
Author:     Emil Laine <emil.laine at cs.helsinki.fi>
AuthorDate: Thu Sep 15 15:29:33 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 12 08:49:16 2016 -0400

    FindSDL: Add -mwindows to link flags for MinGW, correct wording
    
    The `-mwindows` flag is needed to avoid creating an additional console
    window when starting SDL applications built with MinGW.  There is no
    `mwindows` library.
    
    See also https://cygwin.com/ml/cygwin/2007-04/msg00027.html

diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index c0cdd98..4e4411f 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -122,11 +122,10 @@ if(NOT APPLE)
   find_package(Threads)
 endif()
 
-# MinGW needs an additional library, mwindows
-# It's total link flags should look like -lmingw32 -lSDLmain -lSDL -lmwindows
-# (Actually on second look, I think it only needs one of the m* libraries.)
+# MinGW needs an additional link flag, -mwindows
+# It's total link flags should look like -lmingw32 -lSDLmain -lSDL -mwindows
 if(MINGW)
-  set(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+  set(MINGW32_LIBRARY mingw32 "-mwindows" CACHE STRING "link flags for MinGW")
 endif()
 
 if(SDL_LIBRARY_TEMP)

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

Summary of changes:
 Modules/FindSDL.cmake     |    7 +++----
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake