[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3186-g6080b77
Brad King
brad.king at kitware.com
Fri May 16 14:12:18 EDT 2014
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 6080b77c4cf03ccfae181353a42ddc08521ded38 (commit)
via 200cda56d61be85d3282dadd0efa6d5baa3745d9 (commit)
from 41afe8b805b174664a8c28429c70b717838d6093 (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=6080b77c4cf03ccfae181353a42ddc08521ded38
commit 6080b77c4cf03ccfae181353a42ddc08521ded38
Merge: 41afe8b 200cda5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 16 14:12:17 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 16 14:12:17 2014 -0400
Merge topic 'preserve_cmake_minimum_required_version' into next
200cda56 Revert topic 'preserve_cmake_minimum_required_version'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=200cda56d61be85d3282dadd0efa6d5baa3745d9
commit 200cda56d61be85d3282dadd0efa6d5baa3745d9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 16 14:12:35 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 16 14:12:55 2014 -0400
Revert topic 'preserve_cmake_minimum_required_version'
This change exposed a bug in the CMP0022 NEW behavior. That will
need to be fixed before this change can be made cleanly.
diff --git a/Modules/CheckLanguage.cmake b/Modules/CheckLanguage.cmake
index 99c809b..3bd126a 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 ${CMAKE_VERSION})
+ "cmake_minimum_required(VERSION 2.8)
project(Check${lang} ${lang})
file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\"
\"set(CMAKE_${lang}_COMPILER \\\"\${CMAKE_${lang}_COMPILER}\\\")\\n\"
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index 8ce6b88..ad3b6b5 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -79,7 +79,7 @@ include(CheckIncludeFile)
include(CheckIncludeFileCXX)
cmake_policy(PUSH)
-cmake_policy(VERSION 3.0)
+cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 14135eb..1f69620 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -330,6 +330,11 @@
# 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 eaa5e55..15bcab8 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -572,6 +572,7 @@ 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}] "
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 5fa40a5..8b22ff7 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 ${CMAKE_VERSION})
+ "cmake_minimum_required(VERSION 2.8)
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 b6232ed..d35a72c 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 ${CMAKE_VERSION})
+cmake_minimum_required(VERSION 2.6.3)
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 f17d91a..e969f24 100644
--- a/Modules/FortranCInterface/Verify/CMakeLists.txt
+++ b/Modules/FortranCInterface/Verify/CMakeLists.txt
@@ -9,8 +9,7 @@
# See the License for more information.
#=============================================================================
-cmake_minimum_required(VERSION ${CMAKE_VERSION})
-cmake_policy(SET CMP0022 OLD) # TODO: This should not be needed.
+cmake_minimum_required(VERSION 2.7)
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 d115704..96dc4e6 100644
--- a/Modules/IntelVSImplicitPath/CMakeLists.txt
+++ b/Modules/IntelVSImplicitPath/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION ${CMAKE_VERSION})
+cmake_minimum_required (VERSION 2.8)
project(IntelFortranImplicit Fortran)
add_custom_command(
OUTPUT output.cmake
-----------------------------------------------------------------------
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 | 3 +--
Modules/IntelVSImplicitPath/CMakeLists.txt | 2 +-
8 files changed, 12 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list