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 d9a618b3535c7ab0bed98c4e788ec47334877c83 (commit) via 1890c668e92b8bcd60075cf0a5a70411da2a2444 (commit) via 81a3f228824058849368f9c3a8e318c02fa03097 (commit) from d409750325ca6d5abc1f75f2eb25f4e893f0a972 (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=d9a618b3535c7ab0bed98c4e788ec47334877c83 commit d9a618b3535c7ab0bed98c4e788ec47334877c83 Merge: d409750 1890c66 Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com> AuthorDate: Mon May 19 10:55:47 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon May 19 10:55:47 2014 -0400 Merge topic 'preserve_cmake_minimum_required_version' into next 1890c668 Keep cmake_minimum_required calls in sync with current version 81a3f228 Do not change minimum required version in modules http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1890c668e92b8bcd60075cf0a5a70411da2a2444 commit 1890c668e92b8bcd60075cf0a5a70411da2a2444 Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it> AuthorDate: Tue May 13 11:02:19 2014 +0200 Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it> CommitDate: Mon May 19 16:55:12 2014 +0200 Keep cmake_minimum_required calls in sync with current version Update cmake_minimum_required calls in CMakeLists.txt in Modules and in CMakeLists.txt generated by other modules, so that they are always in sync with current CMake version. diff --git a/Modules/CheckLanguage.cmake b/Modules/CheckLanguage.cmake index 3bd126a..99c809b 100644 --- a/Modules/CheckLanguage.cmake +++ b/Modules/CheckLanguage.cmake @@ -47,7 +47,7 @@ macro(check_language lang) message(STATUS ${_desc}) file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang}) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang}/CMakeLists.txt" - "cmake_minimum_required(VERSION 2.8) + "cmake_minimum_required(VERSION ${CMAKE_VERSION}) project(Check${lang} ${lang}) file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\" \"set(CMAKE_${lang}_COMPILER \\\"\${CMAKE_${lang}_COMPILER}\\\")\\n\" diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake index 8b22ff7..5fa40a5 100644 --- a/Modules/FindSDL_sound.cmake +++ b/Modules/FindSDL_sound.cmake @@ -183,7 +183,7 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) # in the SDL_LIBRARY string after the "-framework". # But if I quote the stuff in INCLUDE_DIRECTORIES, it doesn't work. file(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/CMakeLists.txt - "cmake_minimum_required(VERSION 2.8) + "cmake_minimum_required(VERSION ${CMAKE_VERSION}) project(DetermineSoundLibs) include_directories(${SDL_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR}) add_executable(DetermineSoundLibs DetermineSoundLibs.c) diff --git a/Modules/FortranCInterface/CMakeLists.txt b/Modules/FortranCInterface/CMakeLists.txt index d35a72c..b6232ed 100644 --- a/Modules/FortranCInterface/CMakeLists.txt +++ b/Modules/FortranCInterface/CMakeLists.txt @@ -9,7 +9,7 @@ # See the License for more information. #============================================================================= -cmake_minimum_required(VERSION 2.6.3) +cmake_minimum_required(VERSION ${CMAKE_VERSION}) project(FortranCInterface C Fortran) include(${FortranCInterface_BINARY_DIR}/Input.cmake OPTIONAL) diff --git a/Modules/FortranCInterface/Verify/CMakeLists.txt b/Modules/FortranCInterface/Verify/CMakeLists.txt index e969f24..cde3c53 100644 --- a/Modules/FortranCInterface/Verify/CMakeLists.txt +++ b/Modules/FortranCInterface/Verify/CMakeLists.txt @@ -9,7 +9,7 @@ # See the License for more information. #============================================================================= -cmake_minimum_required(VERSION 2.7) +cmake_minimum_required(VERSION ${CMAKE_VERSION}) project(VerifyFortranC C Fortran) option(VERIFY_CXX "Whether to verify C++ and Fortran" OFF) diff --git a/Modules/IntelVSImplicitPath/CMakeLists.txt b/Modules/IntelVSImplicitPath/CMakeLists.txt index 96dc4e6..d115704 100644 --- a/Modules/IntelVSImplicitPath/CMakeLists.txt +++ b/Modules/IntelVSImplicitPath/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required(VERSION ${CMAKE_VERSION}) project(IntelFortranImplicit Fortran) add_custom_command( OUTPUT output.cmake http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81a3f228824058849368f9c3a8e318c02fa03097 commit 81a3f228824058849368f9c3a8e318c02fa03097 Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it> AuthorDate: Wed May 7 15:41:18 2014 +0200 Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it> CommitDate: Mon May 19 16:55:12 2014 +0200 Do not change minimum required version in modules Some modules change CMake minimum required version when they are included. For example: cmake_minimum_required(VERSION 2.8.12) message("${CMAKE_MINIMUM_REQUIRED_VERSION}") include(CheckTypeSize) message("${CMAKE_MINIMUM_REQUIRED_VERSION}") will produce the following output: 2.8.12 2.6 This patch ensures that when you include a CMake module the minimum required version and the policies set are left unchanged. Fixes Issue #14864 diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake index ad3b6b5..8ce6b88 100644 --- a/Modules/CheckTypeSize.cmake +++ b/Modules/CheckTypeSize.cmake @@ -79,7 +79,7 @@ include(CheckIncludeFile) include(CheckIncludeFileCXX) cmake_policy(PUSH) -cmake_minimum_required(VERSION 2.6 FATAL_ERROR) +cmake_policy(VERSION 3.0) get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH) diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index d1c31a4..d9809ad 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -330,11 +330,6 @@ # FindCUDA.cmake -# We need to have at least this version to support the VERSION_LESS argument to 'if' (2.6.2) and unset (2.6.3) -cmake_policy(PUSH) -cmake_minimum_required(VERSION 2.6.3) -cmake_policy(POP) - # This macro helps us find the location of helper files we will need the full path to macro(CUDA_FIND_HELPER_FILE _name _extension) set(_full_name "${_name}.${_extension}") diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 15bcab8..eaa5e55 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -572,7 +572,6 @@ endif() # If specified, enforce version number # if(GTK2_FIND_VERSION) - cmake_minimum_required(VERSION 2.6.2) set(GTK2_FAILED_VERSION_CHECK true) if(GTK2_DEBUG) message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " ----------------------------------------------------------------------- Summary of changes: Modules/CheckLanguage.cmake | 2 +- Modules/CheckTypeSize.cmake | 2 +- Modules/FindCUDA.cmake | 5 ----- Modules/FindGTK2.cmake | 1 - Modules/FindSDL_sound.cmake | 2 +- Modules/FortranCInterface/CMakeLists.txt | 2 +- Modules/FortranCInterface/Verify/CMakeLists.txt | 2 +- Modules/IntelVSImplicitPath/CMakeLists.txt | 2 +- 8 files changed, 6 insertions(+), 12 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits