[Cmake-commits] CMake branch, next, updated. v3.1.0-1517-gf2ff942
Rolf Eike Beer
eike at sf-mail.de
Wed Jan 7 17:47:29 EST 2015
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 f2ff942e6346e0e689dec36f440de3beb512f799 (commit)
via fd329307b2ee76abaa41e25a300902a2fb983895 (commit)
from 7ece74108e1d0e5dd859943f831794a745a657c9 (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=f2ff942e6346e0e689dec36f440de3beb512f799
commit f2ff942e6346e0e689dec36f440de3beb512f799
Merge: 7ece741 fd32930
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 7 17:47:28 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 7 17:47:28 2015 -0500
Merge topic 'FindSDL-quoting' into next
fd329307 FindSDL: fix bad variable expansion
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd329307b2ee76abaa41e25a300902a2fb983895
commit fd329307b2ee76abaa41e25a300902a2fb983895
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 7 23:46:56 2015 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 7 23:46:56 2015 +0100
FindSDL: fix bad variable expansion
Thanks to OpenBSD for not reporting that upstream.
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:
Modules/FindSDL.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list