[Cmake-commits] CMake branch, next, updated. v3.0.0-4763-g2d89813

[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  2d89813845f87c519339a33c43f5e1b5a11021a3 (commit)
       via  bf89f9103410036c6b09aba79330bb41ad300bcf (commit)
      from  0fbb08b228c1ce0cef6d4c6332d0dbcde87b03f4 (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=2d89813845f87c519339a33c43f5e1b5a11021a3
commit 2d89813845f87c519339a33c43f5e1b5a11021a3
Merge: 0fbb08b bf89f91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 5 09:14:35 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 5 09:14:35 2014 -0400

    Merge topic 'CheckIncludeFiles-main-prototype' into next
    
    bf89f910 CheckIncludeFiles: Use modern C declaration for 'main' (#15058)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf89f9103410036c6b09aba79330bb41ad300bcf
commit bf89f9103410036c6b09aba79330bb41ad300bcf
Author:     Nate Eldredge <nate at thatsmathematics.com>
AuthorDate: Mon Aug 4 21:00:55 2014 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 5 09:09:58 2014 -0400

    CheckIncludeFiles: Use modern C declaration for 'main' (#15058)
    
    Otherwise some compilers will incorrectly fail the checks when certain
    warning/error flags are enabled.

diff --git a/Modules/CheckIncludeFiles.cmake b/Modules/CheckIncludeFiles.cmake
index eb4cf0d..f8378c0 100644
--- a/Modules/CheckIncludeFiles.cmake
+++ b/Modules/CheckIncludeFiles.cmake
@@ -53,7 +53,7 @@ macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
         "${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n")
     endforeach()
     set(CMAKE_CONFIGURABLE_FILE_CONTENT
-      "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n\nint main(){return 0;}\n")
+      "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n\nint main(void){return 0;}\n")
     configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
       "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFiles.c" @ONLY)
 

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

Summary of changes:
 Modules/CheckIncludeFiles.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake