[Cmake-commits] CMake branch, next, updated. v3.1.0-1527-gd9747a8

[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  d9747a8a692fd2129cc13a7ce320b5a61bc3d6e8 (commit)
       via  67516fb57e7f0781c79801efdcae8f76bb1adaae (commit)
      from  018444bac72ac1672f9886449cd53745888e9d24 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9747a8a692fd2129cc13a7ce320b5a61bc3d6e8
commit d9747a8a692fd2129cc13a7ce320b5a61bc3d6e8
Merge: 018444b 67516fb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 8 14:48:23 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 8 14:48:23 2015 -0500

    Merge topic 'FindSDL-quoting' into next
    
    67516fb5 FindSDL: Allow if() to dereference SDL_INCLUDE_DIR for matching


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67516fb57e7f0781c79801efdcae8f76bb1adaae
commit 67516fb57e7f0781c79801efdcae8f76bb1adaae
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 7 23:46:56 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 8 14:47:39 2015 -0500

    FindSDL: Allow if() to dereference SDL_INCLUDE_DIR for matching
    
    Otherwise the syntax is incorrect when the variable is empty.

diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 3905e54..45ca1d4 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -106,7 +106,7 @@ find_library(SDL_LIBRARY_TEMP
 )
 
 if(NOT SDL_BUILDING_LIBRARY)
-  if(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+  if(NOT SDL_INCLUDE_DIR MATCHES ".framework")
     # Non-OS X framework versions expect you to also dynamically link to
     # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
     # seem to provide SDLmain for compatibility even though they don't

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

Summary of changes:


hooks/post-receive
-- 
CMake