- backport_findpython_fixes.diff - backport_findruby_improvements.diff - backport_support_cxxtest4.diff - manpage_fixes.diff - mipsel_is_little_endian.diff - paths_in_regex_espace_metachars.diffci/unstable
Modestas Vainius
13 years ago
parent
edcb95fa19
commit
04c0477c56
@ -1,282 +0,0 @@
|
|||||||
From: Rolf Eike Beer <eike@sf-mail.de>
|
|
||||||
Subject: Various FindPython* fixes
|
|
||||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663188
|
|
||||||
Applied-Upstream: 2.8.8
|
|
||||||
Origin: backport, commit:a04ced3 FindPythonLibs: Search for single-user installs on Windows
|
|
||||||
commit:0fe4d69 FindPythonInterp: make version selectable
|
|
||||||
commit:aa11536 FindPythonInterp: fix version parsing
|
|
||||||
commit:bde7b5a FindPythonInterp: try harder to get a version number
|
|
||||||
commit:bbddaee FindPython{Interp,Libs}: document Python_ADDITIONAL_VERSIONS as input
|
|
||||||
commit:f772378 FindPythonLibs: make the version selection work as for PythonInterp
|
|
||||||
commit:c9c1a17 FindPythonLibs: get the exact version of the found library (#3080)
|
|
||||||
commit:91d5a2a FindPythonLibs: put debug libraries into PYTHON_LIBRARIES
|
|
||||||
commit:7d6db93 FindPythonInterp: rework the version detection
|
|
||||||
commit:53d02ea FindPythonLibs: stop scanning when libraries are found
|
|
||||||
commit:fc495b7 Merge topic 'findpythoninterp-version-detection'
|
|
||||||
Last-Update: 2012-03-16
|
|
||||||
|
|
||||||
The main feature is support for:
|
|
||||||
|
|
||||||
-DPythonLibs_FIND_VERSION=<version> and
|
|
||||||
-DPythonInterp_FIND_VERSION=<version>
|
|
||||||
|
|
||||||
--- a/Modules/FindPythonLibs.cmake
|
|
||||||
+++ b/Modules/FindPythonLibs.cmake
|
|
||||||
@@ -7,8 +7,12 @@
|
|
||||||
# PYTHON_LIBRARIES - path to the python library
|
|
||||||
# PYTHON_INCLUDE_PATH - path to where Python.h is found (deprecated)
|
|
||||||
# PYTHON_INCLUDE_DIRS - path to where Python.h is found
|
|
||||||
-# PYTHON_DEBUG_LIBRARIES - path to the debug library
|
|
||||||
-# Python_ADDITIONAL_VERSIONS - list of additional Python versions to search for
|
|
||||||
+# PYTHON_DEBUG_LIBRARIES - path to the debug library (deprecated)
|
|
||||||
+# PYTHONLIBS_VERSION_STRING - version of the Python libs found (since CMake 2.8.8)
|
|
||||||
+#
|
|
||||||
+# The Python_ADDITIONAL_VERSIONS variable can be used to specify a list of
|
|
||||||
+# version numbers that should be taken into account when searching for Python.
|
|
||||||
+# You need to set this variable before calling find_package(PythonLibs).
|
|
||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2001-2009 Kitware, Inc.
|
|
||||||
@@ -27,11 +31,42 @@ INCLUDE(CMakeFindFrameworks)
|
|
||||||
# Search for the python framework on Apple.
|
|
||||||
CMAKE_FIND_FRAMEWORKS(Python)
|
|
||||||
|
|
||||||
+SET(_PYTHON1_VERSIONS 1.6 1.5)
|
|
||||||
+SET(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
|
||||||
+SET(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
|
|
||||||
+
|
|
||||||
+IF(PythonLibs_FIND_VERSION)
|
|
||||||
+ IF(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
|
|
||||||
+ STRING(REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" _PYTHON_FIND_MAJ_MIN "${PythonLibs_FIND_VERSION}")
|
|
||||||
+ STRING(REGEX REPLACE "^([0-9]+).*" "\\1" _PYTHON_FIND_MAJ "${_PYTHON_FIND_MAJ_MIN}")
|
|
||||||
+ UNSET(_PYTHON_FIND_OTHER_VERSIONS)
|
|
||||||
+ IF(NOT PythonLibs_FIND_VERSION_EXACT)
|
|
||||||
+ FOREACH(_PYTHON_V ${_PYTHON${_PYTHON_FIND_MAJ}_VERSIONS})
|
|
||||||
+ IF(NOT _PYTHON_V VERSION_LESS _PYTHON_FIND_MAJ_MIN)
|
|
||||||
+ LIST(APPEND _PYTHON_FIND_OTHER_VERSIONS ${_PYTHON_V})
|
|
||||||
+ ENDIF()
|
|
||||||
+ ENDFOREACH()
|
|
||||||
+ ENDIF(NOT PythonLibs_FIND_VERSION_EXACT)
|
|
||||||
+ UNSET(_PYTHON_FIND_MAJ_MIN)
|
|
||||||
+ UNSET(_PYTHON_FIND_MAJ)
|
|
||||||
+ ELSE(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
|
|
||||||
+ SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON${PythonLibs_FIND_VERSION}_VERSIONS})
|
|
||||||
+ ENDIF(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
|
|
||||||
+ELSE(PythonLibs_FIND_VERSION)
|
|
||||||
+ SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
|
|
||||||
+ENDIF(PythonLibs_FIND_VERSION)
|
|
||||||
+
|
|
||||||
# Set up the versions we know about, in the order we will search. Always add
|
|
||||||
# the user supplied additional versions to the front.
|
|
||||||
-set(_Python_VERSIONS
|
|
||||||
+SET(_Python_VERSIONS
|
|
||||||
${Python_ADDITIONAL_VERSIONS}
|
|
||||||
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
|
|
||||||
+ ${_PYTHON_FIND_OTHER_VERSIONS}
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
+UNSET(_PYTHON_FIND_OTHER_VERSIONS)
|
|
||||||
+UNSET(_PYTHON1_VERSIONS)
|
|
||||||
+UNSET(_PYTHON2_VERSIONS)
|
|
||||||
+UNSET(_PYTHON3_VERSIONS)
|
|
||||||
|
|
||||||
FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
|
|
||||||
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
|
|
||||||
@@ -40,13 +75,17 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSI
|
|
||||||
NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
|
|
||||||
PATHS
|
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
|
|
||||||
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs )
|
|
||||||
+ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
|
|
||||||
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
|
|
||||||
+ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
|
|
||||||
+ )
|
|
||||||
ENDIF(WIN32)
|
|
||||||
|
|
||||||
FIND_LIBRARY(PYTHON_LIBRARY
|
|
||||||
NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
|
|
||||||
PATHS
|
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
|
|
||||||
+ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
|
|
||||||
# Avoid finding the .dll in the PATH. We want the .lib.
|
|
||||||
NO_SYSTEM_ENVIRONMENT_PATH
|
|
||||||
)
|
|
||||||
@@ -79,6 +118,7 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSI
|
|
||||||
PATHS
|
|
||||||
${PYTHON_FRAMEWORK_INCLUDES}
|
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
|
|
||||||
+ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
|
|
||||||
PATH_SUFFIXES
|
|
||||||
python${_CURRENT_VERSION}
|
|
||||||
)
|
|
||||||
@@ -87,6 +127,17 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSI
|
|
||||||
SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}" CACHE INTERNAL
|
|
||||||
"Path to where Python.h is found (deprecated)")
|
|
||||||
|
|
||||||
+ IF(PYTHON_INCLUDE_DIR AND EXISTS "${PYTHON_INCLUDE_DIR}/patchlevel.h")
|
|
||||||
+ FILE(STRINGS "${PYTHON_INCLUDE_DIR}/patchlevel.h" python_version_str
|
|
||||||
+ REGEX "^#define[ \t]+PY_VERSION[ \t]+\"[^\"]+\"")
|
|
||||||
+ STRING(REGEX REPLACE "^#define[ \t]+PY_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
|
|
||||||
+ PYTHONLIBS_VERSION_STRING "${python_version_str}")
|
|
||||||
+ UNSET(python_version_str)
|
|
||||||
+ ENDIF(PYTHON_INCLUDE_DIR AND EXISTS "${PYTHON_INCLUDE_DIR}/patchlevel.h")
|
|
||||||
+
|
|
||||||
+ IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
|
|
||||||
+ BREAK()
|
|
||||||
+ ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
|
|
||||||
ENDFOREACH(_CURRENT_VERSION)
|
|
||||||
|
|
||||||
MARK_AS_ADVANCED(
|
|
||||||
@@ -100,13 +151,23 @@ MARK_AS_ADVANCED(
|
|
||||||
# library. We now set the variables listed by the documentation for this
|
|
||||||
# module.
|
|
||||||
SET(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
|
|
||||||
-SET(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
|
|
||||||
SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
|
|
||||||
|
|
||||||
+# These variables have been historically named in this module different from
|
|
||||||
+# what SELECT_LIBRARY_CONFIGURATIONS() expects.
|
|
||||||
+SET(PYTHON_LIBRARY_DEBUG "${PYTHON_DEBUG_LIBRARY}")
|
|
||||||
+SET(PYTHON_LIBRARY_RELEASE "${PYTHON_LIBRARY}")
|
|
||||||
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
|
|
||||||
+SELECT_LIBRARY_CONFIGURATIONS(PYTHON)
|
|
||||||
+# SELECT_LIBRARY_CONFIGURATIONS() sets ${PREFIX}_FOUND if it has a library.
|
|
||||||
+# Unset this, this prefix doesn't match the module prefix, they are different
|
|
||||||
+# for historical reasons.
|
|
||||||
+UNSET(PYTHON_FOUND)
|
|
||||||
|
|
||||||
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
|
||||||
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs DEFAULT_MSG PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS)
|
|
||||||
-
|
|
||||||
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs
|
|
||||||
+ REQUIRED_VARS PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS
|
|
||||||
+ VERSION_VAR PYTHONLIBS_VERSION_STRING)
|
|
||||||
|
|
||||||
# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
|
|
||||||
# PYTHON_WRITE_MODULES_HEADER(<filename>) writes a header file you can include
|
|
||||||
--- a/Modules/FindPythonInterp.cmake
|
|
||||||
+++ b/Modules/FindPythonInterp.cmake
|
|
||||||
@@ -10,11 +10,14 @@
|
|
||||||
# PYTHON_VERSION_MINOR - Python minor version found e.g. 5
|
|
||||||
# PYTHON_VERSION_PATCH - Python patch version found e.g. 2
|
|
||||||
#
|
|
||||||
-# Python_ADDITIONAL_VERSIONS - list of additional Python versions to search for
|
|
||||||
+# The Python_ADDITIONAL_VERSIONS variable can be used to specify a list of
|
|
||||||
+# version numbers that should be taken into account when searching for Python.
|
|
||||||
+# You need to set this variable before calling find_package(PythonInterp).
|
|
||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2005-2010 Kitware, Inc.
|
|
||||||
# Copyright 2011 Bjoern Ricks <bjoern.ricks@gmail.com>
|
|
||||||
+# Copyright 2012 Rolf Eike Beer <eike@sf-mail.de>
|
|
||||||
#
|
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
# see accompanying file Copyright.txt for details.
|
|
||||||
@@ -26,14 +29,51 @@
|
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
|
||||||
# License text for the above reference.)
|
|
||||||
|
|
||||||
+unset(_Python_NAMES)
|
|
||||||
+
|
|
||||||
+set(_PYTHON1_VERSIONS 1.6 1.5)
|
|
||||||
+set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
|
||||||
+set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
|
|
||||||
+
|
|
||||||
+if(PythonInterp_FIND_VERSION)
|
|
||||||
+ if(PythonInterp_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
|
|
||||||
+ string(REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" _PYTHON_FIND_MAJ_MIN "${PythonInterp_FIND_VERSION}")
|
|
||||||
+ string(REGEX REPLACE "^([0-9]+).*" "\\1" _PYTHON_FIND_MAJ "${_PYTHON_FIND_MAJ_MIN}")
|
|
||||||
+ list(APPEND _Python_NAMES python${_PYTHON_FIND_MAJ_MIN} python${_PYTHON_FIND_MAJ})
|
|
||||||
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
|
|
||||||
+ if(NOT PythonInterp_FIND_VERSION_EXACT)
|
|
||||||
+ foreach(_PYTHON_V ${_PYTHON${_PYTHON_FIND_MAJ}_VERSIONS})
|
|
||||||
+ if(NOT _PYTHON_V VERSION_LESS _PYTHON_FIND_MAJ_MIN)
|
|
||||||
+ list(APPEND _PYTHON_FIND_OTHER_VERSIONS ${_PYTHON_V})
|
|
||||||
+ endif()
|
|
||||||
+ endforeach()
|
|
||||||
+ endif(NOT PythonInterp_FIND_VERSION_EXACT)
|
|
||||||
+ unset(_PYTHON_FIND_MAJ_MIN)
|
|
||||||
+ unset(_PYTHON_FIND_MAJ)
|
|
||||||
+ else(PythonInterp_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
|
|
||||||
+ list(APPEND _Python_NAMES python${PythonInterp_FIND_VERSION})
|
|
||||||
+ set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON${PythonInterp_FIND_VERSION}_VERSIONS})
|
|
||||||
+ endif(PythonInterp_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
|
|
||||||
+else(PythonInterp_FIND_VERSION)
|
|
||||||
+ set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
|
|
||||||
+endif(PythonInterp_FIND_VERSION)
|
|
||||||
+
|
|
||||||
+list(APPEND _Python_NAMES python)
|
|
||||||
+
|
|
||||||
# Search for the current active python version first
|
|
||||||
-find_program(PYTHON_EXECUTABLE NAMES python)
|
|
||||||
+find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
|
|
||||||
|
|
||||||
# Set up the versions we know about, in the order we will search. Always add
|
|
||||||
# the user supplied additional versions to the front.
|
|
||||||
set(_Python_VERSIONS
|
|
||||||
${Python_ADDITIONAL_VERSIONS}
|
|
||||||
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
|
|
||||||
+ ${_PYTHON_FIND_OTHER_VERSIONS}
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
+unset(_PYTHON_FIND_OTHER_VERSIONS)
|
|
||||||
+unset(_PYTHON1_VERSIONS)
|
|
||||||
+unset(_PYTHON2_VERSIONS)
|
|
||||||
+unset(_PYTHON3_VERSIONS)
|
|
||||||
|
|
||||||
# Search for newest python version if python executable isn't found
|
|
||||||
if(NOT PYTHON_EXECUTABLE)
|
|
||||||
@@ -51,12 +91,47 @@ endif()
|
|
||||||
|
|
||||||
# determine python version string
|
|
||||||
if(PYTHON_EXECUTABLE)
|
|
||||||
- execute_process(COMMAND "${PYTHON_EXECUTABLE}" --version ERROR_VARIABLE _VERSION OUTPUT_QUIET ERROR_STRIP_TRAILING_WHITESPACE)
|
|
||||||
- string(REPLACE "Python " "" PYTHON_VERSION_STRING "${_VERSION}")
|
|
||||||
- string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" PYTHON_VERSION_MAJOR "${PYTHON_VERSION_STRING}")
|
|
||||||
- string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" PYTHON_VERSION_MINOR "${PYTHON_VERSION_STRING}")
|
|
||||||
- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PYTHON_VERSION_PATCH "${PYTHON_VERSION_STRING}")
|
|
||||||
-endif()
|
|
||||||
+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c
|
|
||||||
+ "import sys; sys.stdout.write(';'.join([str(x) for x in sys.version_info[:3]]))"
|
|
||||||
+ OUTPUT_VARIABLE _VERSION
|
|
||||||
+ RESULT_VARIABLE _PYTHON_VERSION_RESULT
|
|
||||||
+ ERROR_QUIET)
|
|
||||||
+ if(NOT _PYTHON_VERSION_RESULT)
|
|
||||||
+ string(REPLACE ";" "." PYTHON_VERSION_STRING "${_VERSION}")
|
|
||||||
+ list(GET _VERSION 0 PYTHON_VERSION_MAJOR)
|
|
||||||
+ list(GET _VERSION 1 PYTHON_VERSION_MINOR)
|
|
||||||
+ list(GET _VERSION 2 PYTHON_VERSION_PATCH)
|
|
||||||
+ if(PYTHON_VERSION_PATCH EQUAL 0)
|
|
||||||
+ # it's called "Python 2.7", not "2.7.0"
|
|
||||||
+ string(REGEX REPLACE "\\.0$" "" PYTHON_VERSION_STRING "${PYTHON_VERSION_STRING}")
|
|
||||||
+ endif()
|
|
||||||
+ else()
|
|
||||||
+ # sys.version predates sys.version_info, so use that
|
|
||||||
+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write(sys.version)"
|
|
||||||
+ OUTPUT_VARIABLE _VERSION
|
|
||||||
+ RESULT_VARIABLE _PYTHON_VERSION_RESULT
|
|
||||||
+ ERROR_QUIET)
|
|
||||||
+ if(NOT _PYTHON_VERSION_RESULT)
|
|
||||||
+ string(REGEX REPLACE " .*" "" PYTHON_VERSION_STRING "${_VERSION}")
|
|
||||||
+ string(REGEX REPLACE "^([0-9]+)\\.[0-9]+.*" "\\1" PYTHON_VERSION_MAJOR "${PYTHON_VERSION_STRING}")
|
|
||||||
+ string(REGEX REPLACE "^[0-9]+\\.([0-9])+.*" "\\1" PYTHON_VERSION_MINOR "${PYTHON_VERSION_STRING}")
|
|
||||||
+ if(PYTHON_VERSION_STRING MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+.*")
|
|
||||||
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PYTHON_VERSION_PATCH "${PYTHON_VERSION_STRING}")
|
|
||||||
+ else()
|
|
||||||
+ set(PYTHON_VERSION_PATCH "0")
|
|
||||||
+ endif()
|
|
||||||
+ else()
|
|
||||||
+ # sys.version was first documented for Python 1.5, so assume
|
|
||||||
+ # this is older.
|
|
||||||
+ set(PYTHON_VERSION_STRING "1.4")
|
|
||||||
+ set(PYTHON_VERSION_MAJOR "1")
|
|
||||||
+ set(PYTHON_VERSION_MAJOR "4")
|
|
||||||
+ set(PYTHON_VERSION_MAJOR "0")
|
|
||||||
+ endif()
|
|
||||||
+ endif()
|
|
||||||
+ unset(_PYTHON_VERSION_RESULT)
|
|
||||||
+ unset(_VERSION)
|
|
||||||
+endif(PYTHON_EXECUTABLE)
|
|
||||||
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set PYTHONINTERP_FOUND to TRUE if
|
|
||||||
# all listed variables are TRUE
|
|
||||||
@ -1,165 +0,0 @@
|
|||||||
From: Alex Neundorf <neundorf@kde.org>
|
|
||||||
From: Rolf Eike Beer <eike@sf-mail.de>
|
|
||||||
Subject: Various FindRuby improvements and bug fixes
|
|
||||||
Applied-Upstream: 2.8.8
|
|
||||||
Bug: http://public.kitware.com/Bug/view.php?id=12172
|
|
||||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643949
|
|
||||||
Origin: backport, commit:93c55ec FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)
|
|
||||||
commit:3db2c8b FindRuby: add more possible library names (for ubuntu, #12172)
|
|
||||||
commit:a9bca05 FindRuby.cmake: add more debug output
|
|
||||||
commit:409aeaf FindRuby: do not blindly set version to 1.8.0
|
|
||||||
commit:854e762 FindRuby: clean up querying variables from Ruby
|
|
||||||
Last-Update: 2012-03-16
|
|
||||||
|
|
||||||
Backport a bunch of FindRuby improvements and bug fixes from cmake master.
|
|
||||||
FindRuby should find ruby 1.9.1 as packaged in Debian now.
|
|
||||||
|
|
||||||
--- a/Modules/FindRuby.cmake
|
|
||||||
+++ b/Modules/FindRuby.cmake
|
|
||||||
@@ -60,50 +60,45 @@ ENDIF("${Ruby_FIND_VERSION_SHORT_NODOT}"
|
|
||||||
FIND_PROGRAM(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
|
|
||||||
|
|
||||||
|
|
||||||
-IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
|
|
||||||
- # query the ruby version
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MAJOR']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_VERSION_MAJOR)
|
|
||||||
+IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
|
|
||||||
+ FUNCTION(_RUBY_CONFIG_VAR RBVAR OUTVAR)
|
|
||||||
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']"
|
|
||||||
+ RESULT_VARIABLE _RUBY_SUCCESS
|
|
||||||
+ OUTPUT_VARIABLE _RUBY_OUTPUT
|
|
||||||
+ ERROR_QUIET)
|
|
||||||
+ IF(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT)
|
|
||||||
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
|
|
||||||
+ RESULT_VARIABLE _RUBY_SUCCESS
|
|
||||||
+ OUTPUT_VARIABLE _RUBY_OUTPUT
|
|
||||||
+ ERROR_QUIET)
|
|
||||||
+ ENDIF(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT)
|
|
||||||
+ SET(${OUTVAR} "${_RUBY_OUTPUT}" PARENT_SCOPE)
|
|
||||||
+ ENDFUNCTION(_RUBY_CONFIG_VAR)
|
|
||||||
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MINOR']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_VERSION_MINOR)
|
|
||||||
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['TEENY']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_VERSION_PATCH)
|
|
||||||
+ # query the ruby version
|
|
||||||
+ _RUBY_CONFIG_VAR("MAJOR" RUBY_VERSION_MAJOR)
|
|
||||||
+ _RUBY_CONFIG_VAR("MINOR" RUBY_VERSION_MINOR)
|
|
||||||
+ _RUBY_CONFIG_VAR("TEENY" RUBY_VERSION_PATCH)
|
|
||||||
|
|
||||||
# query the different directories
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_ARCH_DIR)
|
|
||||||
-
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['arch']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_ARCH)
|
|
||||||
-
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubyhdrdir']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_HDR_DIR)
|
|
||||||
-
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR)
|
|
||||||
-
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_RUBY_LIB_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("arch" RUBY_ARCH)
|
|
||||||
+ _RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
|
|
||||||
|
|
||||||
# site_ruby
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_SITEARCH_DIR)
|
|
||||||
-
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_SITELIB_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
|
|
||||||
|
|
||||||
# vendor_ruby available ?
|
|
||||||
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
|
||||||
OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
|
|
||||||
|
|
||||||
IF(RUBY_HAS_VENDOR_RUBY)
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorlibdir']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_VENDORLIB_DIR)
|
|
||||||
-
|
|
||||||
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']"
|
|
||||||
- OUTPUT_VARIABLE RUBY_VENDORARCH_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
|
|
||||||
ENDIF(RUBY_HAS_VENDOR_RUBY)
|
|
||||||
|
|
||||||
# save the results in the cache so we don't have to run ruby the next time again
|
|
||||||
@@ -135,11 +130,11 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_
|
|
||||||
RUBY_VERSION_MINOR
|
|
||||||
RUBY_VERSION_PATCH
|
|
||||||
)
|
|
||||||
-ENDIF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
|
|
||||||
+ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
|
|
||||||
|
|
||||||
# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
|
|
||||||
# try to detect which version we found. This is not too good.
|
|
||||||
-IF(NOT RUBY_VERSION_MAJOR)
|
|
||||||
+IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
|
|
||||||
# by default assume 1.8.0
|
|
||||||
SET(RUBY_VERSION_MAJOR 1)
|
|
||||||
SET(RUBY_VERSION_MINOR 8)
|
|
||||||
@@ -149,13 +144,14 @@ IF(NOT RUBY_VERSION_MAJOR)
|
|
||||||
SET(RUBY_VERSION_MAJOR 1)
|
|
||||||
SET(RUBY_VERSION_MINOR 9)
|
|
||||||
ENDIF(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR)
|
|
||||||
-ENDIF(NOT RUBY_VERSION_MAJOR)
|
|
||||||
-
|
|
||||||
+ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
|
|
||||||
|
|
||||||
-SET(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
|
|
||||||
-SET(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
|
|
||||||
-SET(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
|
|
||||||
-SET(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
|
|
||||||
+IF(RUBY_VERSION_MAJOR)
|
|
||||||
+ SET(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
|
|
||||||
+ SET(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
|
|
||||||
+ SET(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
|
|
||||||
+ SET(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
|
|
||||||
+ENDIF(RUBY_VERSION_MAJOR)
|
|
||||||
|
|
||||||
FIND_PATH(RUBY_INCLUDE_DIR
|
|
||||||
NAMES ruby.h
|
|
||||||
@@ -167,7 +163,7 @@ FIND_PATH(RUBY_INCLUDE_DIR
|
|
||||||
SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
|
|
||||||
|
|
||||||
# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
|
|
||||||
-IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
|
|
||||||
+IF( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18 OR RUBY_HDR_DIR)
|
|
||||||
FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
|
|
||||||
NAMES ruby/config.h config.h
|
|
||||||
HINTS
|
|
||||||
@@ -176,11 +172,11 @@ IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GRE
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
|
|
||||||
-ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
|
|
||||||
+ENDIF( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18 OR RUBY_HDR_DIR)
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the list of possible names for the ruby library
|
|
||||||
-SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
|
|
||||||
+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
|
|
||||||
|
|
||||||
IF(WIN32)
|
|
||||||
SET( _RUBY_MSVC_RUNTIME "" )
|
|
||||||
@@ -224,6 +220,10 @@ IF(_RUBY_DEBUG_OUTPUT)
|
|
||||||
MESSAGE(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")
|
|
||||||
MESSAGE(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"")
|
|
||||||
MESSAGE(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}")
|
|
||||||
+ MESSAGE(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}")
|
|
||||||
+ MESSAGE(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}")
|
|
||||||
+ MESSAGE(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}")
|
|
||||||
+ MESSAGE(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}")
|
|
||||||
MESSAGE(STATUS "--------------------")
|
|
||||||
ENDIF(_RUBY_DEBUG_OUTPUT)
|
|
||||||
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
From: Droscy <droscy85@yahoo.it>
|
|
||||||
From: Simone Rossetto <simros85@gmail.com>
|
|
||||||
Subject: FindCxxTest: Add support for CxxTest 4 (#13022)
|
|
||||||
Bug: http://public.kitware.com/Bug/view.php?id=13022
|
|
||||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662982
|
|
||||||
Forwarded: yes
|
|
||||||
Origin: backport, commit:a556137608ac63318183c957c0c3f221fc943017
|
|
||||||
Applied-Upstream: 2.8.8
|
|
||||||
Last-Update: 2012-03-07
|
|
||||||
|
|
||||||
In CxxTest version 4 the Perl generator has been deleted and the
|
|
||||||
Python generator is installed without the ".py" extension.
|
|
||||||
|
|
||||||
--- a/Modules/FindCxxTest.cmake
|
|
||||||
+++ b/Modules/FindCxxTest.cmake
|
|
||||||
@@ -9,6 +9,7 @@
|
|
||||||
# Only used in the case both Python & Perl
|
|
||||||
# are detected on the system to control
|
|
||||||
# which CxxTest code generator is used.
|
|
||||||
+# Valid only for CxxTest version 3.
|
|
||||||
#
|
|
||||||
# NOTE: In older versions of this Find Module,
|
|
||||||
# this variable controlled if the Python test
|
|
||||||
@@ -159,7 +160,8 @@ find_package(PythonInterp QUIET)
|
|
||||||
find_package(Perl QUIET)
|
|
||||||
|
|
||||||
find_path(CXXTEST_INCLUDE_DIR cxxtest/TestSuite.h)
|
|
||||||
-find_program(CXXTEST_PYTHON_TESTGEN_EXECUTABLE cxxtestgen.py
|
|
||||||
+find_program(CXXTEST_PYTHON_TESTGEN_EXECUTABLE
|
|
||||||
+ NAMES cxxtestgen cxxtestgen.py
|
|
||||||
PATHS ${CXXTEST_INCLUDE_DIR})
|
|
||||||
find_program(CXXTEST_PERL_TESTGEN_EXECUTABLE cxxtestgen.pl
|
|
||||||
PATHS ${CXXTEST_INCLUDE_DIR})
|
|
||||||
@@ -167,7 +169,7 @@ find_program(CXXTEST_PERL_TESTGEN_EXECUT
|
|
||||||
if(PYTHONINTERP_FOUND OR PERL_FOUND)
|
|
||||||
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
|
||||||
|
|
||||||
- if(PYTHONINTERP_FOUND AND (CXXTEST_USE_PYTHON OR NOT PERL_FOUND))
|
|
||||||
+ if(PYTHONINTERP_FOUND AND (CXXTEST_USE_PYTHON OR NOT PERL_FOUND OR NOT DEFINED CXXTEST_USE_PYTHON))
|
|
||||||
set(CXXTEST_TESTGEN_EXECUTABLE ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE})
|
|
||||||
set(CXXTEST_TESTGEN_INTERPRETER ${PYTHON_EXECUTABLE})
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
From: Modestas Vainius <modax@debian.org>
|
|
||||||
Subject: various typo and formatting fixes in manual pages
|
|
||||||
Bug: http://www.cmake.org/Bug/view.php?id=12975
|
|
||||||
Forwarded: yes
|
|
||||||
Origin: vendor
|
|
||||||
Applied-Upstream: 2.8.8
|
|
||||||
|
|
||||||
The patch fixes the following lintian warnings:
|
|
||||||
|
|
||||||
W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2728: warning: macro `..' not defined
|
|
||||||
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden
|
|
||||||
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden
|
|
||||||
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz explicitely explicitly
|
|
||||||
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz jave java
|
|
||||||
W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakeprops.1.gz 1040: warning [p 25, 3.7i]: can't break line
|
|
||||||
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 4233: warning [p 85, 1.3i]: can't break line
|
|
||||||
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden
|
|
||||||
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden
|
|
||||||
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explicitely explicitly
|
|
||||||
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz jave java
|
|
||||||
|
|
||||||
--- a/Modules/CPackRPM.cmake
|
|
||||||
+++ b/Modules/CPackRPM.cmake
|
|
||||||
@@ -143,7 +143,7 @@
|
|
||||||
# The refered script file(s) will be read and directly
|
|
||||||
# put after the %pre or %preun section
|
|
||||||
# If CPACK_RPM_COMPONENT_INSTALL is set to ON the (un)install script for
|
|
||||||
-# each component can be overriden with
|
|
||||||
+# each component can be overridden with
|
|
||||||
# CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE and
|
|
||||||
# CPACK_RPM_<COMPONENT>_PRE_UNINSTALL_SCRIPT_FILE
|
|
||||||
# One may verify which scriptlet has been included with
|
|
||||||
@@ -156,7 +156,7 @@
|
|
||||||
# The refered script file(s) will be read and directly
|
|
||||||
# put after the %post or %postun section
|
|
||||||
# If CPACK_RPM_COMPONENT_INSTALL is set to ON the (un)install script for
|
|
||||||
-# each component can be overriden with
|
|
||||||
+# each component can be overridden with
|
|
||||||
# CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE and
|
|
||||||
# CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE
|
|
||||||
# One may verify which scriptlet has been included with
|
|
||||||
@@ -165,7 +165,7 @@
|
|
||||||
# CPACK_RPM_<COMPONENT>_USER_FILELIST
|
|
||||||
# Mandatory : NO
|
|
||||||
# Default : -
|
|
||||||
-# May be used to explicitely specify %(<directive>) file line
|
|
||||||
+# May be used to explicitly specify %(<directive>) file line
|
|
||||||
# in the spec file. Like %config(noreplace) or any other directive
|
|
||||||
# that be found in the %files section. Since CPackRPM is generating
|
|
||||||
# the list of files (and directories) the user specified files of
|
|
||||||
--- a/Modules/UseJava.cmake
|
|
||||||
+++ b/Modules/UseJava.cmake
|
|
||||||
@@ -112,7 +112,7 @@
|
|
||||||
# [VERSION TRUE|FALSE]
|
|
||||||
# )
|
|
||||||
#
|
|
||||||
-# Create jave documentation based on files or packages. For more
|
|
||||||
+# Create java documentation based on files or packages. For more
|
|
||||||
# details please read the javadoc manpage.
|
|
||||||
#
|
|
||||||
# There are two main signatures for create_javadoc. The first
|
|
||||||
--- a/Modules/FeatureSummary.cmake
|
|
||||||
+++ b/Modules/FeatureSummary.cmake
|
|
||||||
@@ -125,7 +125,7 @@
|
|
||||||
#
|
|
||||||
# set_package_properties(LibXml2 PROPERTIES TYPE RECOMMENDED
|
|
||||||
# PURPOSE "Enables HTML-import in MyWordProcessor")
|
|
||||||
-# ...
|
|
||||||
+# ...
|
|
||||||
# set_package_properties(LibXml2 PROPERTIES TYPE OPTIONAL
|
|
||||||
# PURPOSE "Enables odt-export in MyWordProcessor")
|
|
||||||
#
|
|
||||||
--- a/Source/cmTarget.cxx
|
|
||||||
+++ b/Source/cmTarget.cxx
|
|
||||||
@@ -1055,10 +1055,10 @@ void cmTarget::DefineProperties(cmake *c
|
|
||||||
"Can be set to one or more UUIDs recognized by Visual Studio "
|
|
||||||
"to indicate the type of project. This value is copied "
|
|
||||||
"verbatim into the generated project file. Example for a "
|
|
||||||
- "managed C++ unit testing project: \""
|
|
||||||
- "{3AC096D0-A1C2-E12C-1390-A8335801FDAB};"
|
|
||||||
- "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\". UUIDs are "
|
|
||||||
- "semicolon-delimited.");
|
|
||||||
+ "managed C++ unit testing project:\n"
|
|
||||||
+ " {3AC096D0-A1C2-E12C-1390-A8335801FDAB};"
|
|
||||||
+ "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\n"
|
|
||||||
+ "UUIDs are semicolon-delimited.");
|
|
||||||
cm->DefineProperty
|
|
||||||
("VS_GLOBAL_KEYWORD", cmProperty::TARGET,
|
|
||||||
"Visual Studio project keyword.",
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
From: Modestas Vainius <modax@debian.org>
|
|
||||||
Subject: KWIML: detect little endian ABI on MIPSEL
|
|
||||||
Forwarded: yes
|
|
||||||
Bug: http://public.kitware.com/Bug/view.php?id=12982
|
|
||||||
Last-Update: 2012-02-19
|
|
||||||
Origin: vendor
|
|
||||||
|
|
||||||
--- a/Utilities/KWIML/ABI.h.in
|
|
||||||
+++ b/Utilities/KWIML/ABI.h.in
|
|
||||||
@@ -380,7 +380,15 @@ suppression macro @KWIML@_ABI_NO_VERIFY
|
|
||||||
#elif defined(__m68k__) || defined(M68000)
|
|
||||||
# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
|
|
||||||
|
|
||||||
-/* MIPS */
|
|
||||||
+/* MIPSel (MIPS little endian) */
|
|
||||||
+#elif defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL)
|
|
||||||
+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE
|
|
||||||
+
|
|
||||||
+/* MIPSeb (MIPS big endian) */
|
|
||||||
+#elif defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB)
|
|
||||||
+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
|
|
||||||
+
|
|
||||||
+/* MIPS (fallback, big endian) */
|
|
||||||
#elif defined(__mips) || defined(__mips__) || defined(__MIPS__)
|
|
||||||
# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
|
|
||||||
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
From: Modestas Vainius <modax@debian.org>
|
|
||||||
Subject: Escape metachars before embedding paths into the regex
|
|
||||||
Forwarded: yes
|
|
||||||
Bug: http://public.kitware.com/Bug/view.php?id=12999
|
|
||||||
Origin: vendor
|
|
||||||
|
|
||||||
${CMake_SOURCE_DIR} and ${CMake_BINARY_DIR} cannot be embedded into regex
|
|
||||||
directly. If they contain special regex metacharacters like +, the regex
|
|
||||||
will break. So just escape such metacharacters with a backslash before
|
|
||||||
embedding the path into the regex.
|
|
||||||
|
|
||||||
The issue affected the following tests: CTestTestConfigFileInBuildDir1 and
|
|
||||||
CTestTestConfigFileInBuildDir2.
|
|
||||||
|
|
||||||
--- a/Tests/CMakeLists.txt
|
|
||||||
+++ b/Tests/CMakeLists.txt
|
|
||||||
@@ -16,6 +16,11 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
|
|
||||||
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${dir}")
|
|
||||||
ENDMACRO(ADD_TEST_MACRO)
|
|
||||||
|
|
||||||
+MACRO(REGEX_ESCAPE_STRING _OUT _IN)
|
|
||||||
+ # Escape special regex metacharacters with a backslash
|
|
||||||
+ string(REGEX REPLACE "([$^.[|*+?()]|])" "\\\\\\1" ${_OUT} "${_IN}")
|
|
||||||
+ENDMACRO(REGEX_ESCAPE_STRING _OUT _IN)
|
|
||||||
+
|
|
||||||
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CheckFortran.cmake)
|
|
||||||
|
|
||||||
# Fake a user home directory to avoid polluting the real one.
|
|
||||||
@@ -1654,9 +1659,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
|
|
||||||
-S "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake" -V
|
|
||||||
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/testOut1.log"
|
|
||||||
)
|
|
||||||
+ REGEX_ESCAPE_STRING(CTEST_TEST_ESCAPED_SOURCE_DIR "${CMake_SOURCE_DIR}")
|
|
||||||
SET_TESTS_PROPERTIES(CTestTestConfigFileInBuildDir1 PROPERTIES DEPENDS CTestTestNoBuild
|
|
||||||
PASS_REGULAR_EXPRESSION
|
|
||||||
- "Reading ctest configuration file: ${CMake_SOURCE_DIR}.Tests.CTestTestConfigFileInBuildDir.CTestConfig.cmake")
|
|
||||||
+ "Reading ctest configuration file: ${CTEST_TEST_ESCAPED_SOURCE_DIR}.Tests.CTestTestConfigFileInBuildDir.CTestConfig.cmake")
|
|
||||||
|
|
||||||
CONFIGURE_FILE(
|
|
||||||
"${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test2.cmake.in"
|
|
||||||
@@ -1670,10 +1676,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
|
|
||||||
-S "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir2/test2.cmake" -V
|
|
||||||
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir2/testOut2.log"
|
|
||||||
)
|
|
||||||
+ REGEX_ESCAPE_STRING(CTEST_TEST_ESCAPED_BINARY_DIR "${CMake_BINARY_DIR}")
|
|
||||||
SET_TESTS_PROPERTIES(CTestTestConfigFileInBuildDir2 PROPERTIES DEPENDS CTestTestNoBuild
|
|
||||||
REQUIRED_FILES ${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir2/CTestConfig.cmake
|
|
||||||
PASS_REGULAR_EXPRESSION
|
|
||||||
- "Reading ctest configuration file: ${CMake_BINARY_DIR}.Tests.CTestTestConfigFileInBuildDir2.CTestConfig.cmake")
|
|
||||||
+ "Reading ctest configuration file: ${CTEST_TEST_ESCAPED_BINARY_DIR}.Tests.CTestTestConfigFileInBuildDir2.CTestConfig.cmake")
|
|
||||||
|
|
||||||
# Use macro, not function so that build can still be driven by CMake 2.4.
|
|
||||||
# After 2.6 is required, this could be a function without the extra 'set'
|
|
||||||
Loading…
Reference in new issue