[Cmake-commits] CMake branch, next, updated. v3.2.2-3077-g4137baa

[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  4137baa4331d7cf7359870682fdd06cb7c0ac529 (commit)
       via  459c03d185016f40cbcac1c024719d6c6a14db68 (commit)
      from  ec41ea7f997c56cfb8f07e1c8f95209545b8378d (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=4137baa4331d7cf7359870682fdd06cb7c0ac529
commit 4137baa4331d7cf7359870682fdd06cb7c0ac529
Merge: ec41ea7 459c03d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 22 10:02:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 22 10:02:53 2015 -0400

    Merge topic 'FindOpenGL-target' into next
    
    459c03d1 fixup! FindOpenGL: Provide imported targets for GL and GLU (#15267)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=459c03d185016f40cbcac1c024719d6c6a14db68
commit 459c03d185016f40cbcac1c024719d6c6a14db68
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 22 09:57:31 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 22 10:00:15 2015 -0400

    fixup! FindOpenGL: Provide imported targets for GL and GLU (#15267)

diff --git a/Tests/FindOpenGL/Test/main.c b/Tests/FindOpenGL/Test/main.c
index 37a5416..0b55c74 100644
--- a/Tests/FindOpenGL/Test/main.c
+++ b/Tests/FindOpenGL/Test/main.c
@@ -26,5 +26,5 @@ int main(int argc, char* argv[])
   gluErrorString(GLU_INVALID_ENUM);
 #endif
   /* Link to a GL symbol without calling it since we have no context.  */
-  return ((int)(&glGetError)) * (argc-1);
+  return ((int)(&glGetError)) % argc;
 }

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

Summary of changes:
 Tests/FindOpenGL/Test/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake