diff options
| author | Marcus D. Hanwell <marcus@cryos.org> | 2009-10-01 09:36:27 -0400 |
|---|---|---|
| committer | Marcus D. Hanwell <marcus@cryos.org> | 2009-10-01 09:36:27 -0400 |
| commit | ab4de93e8648831e03274d96b165ac50f6175148 (patch) | |
| tree | ee80fdf375ff79e46aeb0e6b430d3ddeb9e3802f /dev-util/cmake/files | |
| parent | ea04d385d4f71b060fb6e8c7efca6d397de3bf88 (diff) | |
| download | kde-ab4de93e8648831e03274d96b165ac50f6175148.tar.gz kde-ab4de93e8648831e03274d96b165ac50f6175148.tar.bz2 kde-ab4de93e8648831e03274d96b165ac50f6175148.zip | |
Removed from the overlay, in the main portage tree for wider testing.
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/50cmake-gentoo.el | 4 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.6.4-FindBoost.patch | 22 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-FindJNI.patch | 71 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonInterp.patch | 11 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonLibs.patch | 22 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-python-3.patch | 22 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake.vim | 3 |
7 files changed, 0 insertions, 155 deletions
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el deleted file mode 100644 index e4a1a6d47cb..00000000000 --- a/dev-util/cmake/files/50cmake-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) -(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) -(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) diff --git a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch b/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch deleted file mode 100644 index a251d4fd1c1..00000000000 --- a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -57,7 +57,8 @@ - # - # Currently this module searches for the following version numbers: - # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, --# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0 -+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0, -+# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0 - # - # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should - # add both 1.x and 1.x.0 as shown above. Official Boost include directories -@@ -271,7 +272,8 @@ - # The user has not requested an exact version. Among known - # versions, find those that are acceptable to the user request. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.38.0" "1.38" "1.37.0" "1.37" -+ "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42" "1.41.0" "1.41" -+ "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" - "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0" - "1.34" "1.33.1" "1.33.0" "1.33") - set(_boost_TEST_VERSIONS) diff --git a/dev-util/cmake/files/cmake-FindJNI.patch b/dev-util/cmake/files/cmake-FindJNI.patch deleted file mode 100644 index af723c52919..00000000000 --- a/dev-util/cmake/files/cmake-FindJNI.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake ---- ./Modules/FindJNI.cmake 2009-02-21 21:36:50.000000000 +0100 -+++ ../a/Modules/FindJNI.cmake 2008-11-24 04:44:06.000000000 +0100 -@@ -2,7 +2,7 @@ - # This module finds if Java is installed and determines where the - # include files and libraries are. It also determines what the name of - # the library is. This code sets the following variables: --# -+# - # JNI_INCLUDE_DIRS = the include dirs to use - # JNI_LIBRARIES = the libraries to use - # JAVA_AWT_LIBRARY = the path to the jawt library -@@ -51,6 +51,8 @@ - "${dir}" - "${dir}/client" - "${dir}/server" -+ "${dir}/j9vm" -+ "${dir}/classic" - ) - ENDFOREACH(dir) - -@@ -60,7 +62,7 @@ - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" - $ENV{JAVA_HOME}/include -- /usr/include -+ /usr/include - /usr/local/include - /usr/lib/java/include - /usr/local/lib/java/include -@@ -126,7 +128,7 @@ - ) - ENDIF(JAVA_HAVE_FRAMEWORK) - ELSE(APPLE) -- FIND_LIBRARY(JAVA_AWT_LIBRARY jawt -+ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt - PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES} - ) - FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM -@@ -134,18 +136,23 @@ - ) - ENDIF(APPLE) - --# add in the include path --FIND_PATH(JAVA_INCLUDE_PATH jni.h -+# add in the include path -+FIND_PATH(JAVA_INCLUDE_PATH jni.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ) - --FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h -+FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ${JAVA_INCLUDE_PATH}/win32 - ${JAVA_INCLUDE_PATH}/linux - ${JAVA_INCLUDE_PATH}/freebsd - ) - -+FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h -+ ${JAVA_AWT_INCLUDE_DIRECTORIES} -+ ${JAVA_INCLUDE_PATH} -+) -+ - FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ${JAVA_INCLUDE_PATH} -@@ -169,4 +176,3 @@ - ${JAVA_INCLUDE_PATH2} - ${JAVA_AWT_INCLUDE_PATH} - ) -- diff --git a/dev-util/cmake/files/cmake-FindPythonInterp.patch b/dev-util/cmake/files/cmake-FindPythonInterp.patch deleted file mode 100644 index 2e4c47d6806..00000000000 --- a/dev-util/cmake/files/cmake-FindPythonInterp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/FindPythonInterp.cmake -+++ Modules/FindPythonInterp.cmake -@@ -7,7 +7,7 @@ - # - - FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python -+ NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch deleted file mode 100644 index 7981140296d..00000000000 --- a/dev-util/cmake/files/cmake-FindPythonLibs.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/FindPythonLibs.cmake -+++ Modules/FindPythonLibs.cmake -@@ -13,7 +13,7 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY -@@ -27,10 +27,6 @@ - NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs -- PATH_SUFFIXES -- python${_CURRENT_VERSION}/config -- # Avoid finding the .dll in the PATH. We want the .lib. -- NO_SYSTEM_ENVIRONMENT_PATH - ) - - SET(PYTHON_FRAMEWORK_INCLUDES) diff --git a/dev-util/cmake/files/cmake-python-3.patch b/dev-util/cmake/files/cmake-python-3.patch deleted file mode 100644 index 0fdcd0ca192..00000000000 --- a/dev-util/cmake/files/cmake-python-3.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/FindPythonInterp.cmake -+++ Modules/FindPythonInterp.cmake -@@ -7,7 +7,7 @@ - # - - FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 -+ NAMES python python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] ---- Modules/FindPythonLibs.cmake -+++ Modules/FindPythonLibs.cmake -@@ -13,7 +13,7 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+FOREACH(_CURRENT_VERSION 3.2 3.1 3.0 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim deleted file mode 100644 index 5cecd7d05b6..00000000000 --- a/dev-util/cmake/files/cmake.vim +++ /dev/null @@ -1,3 +0,0 @@ -autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim -autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake -autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake |
