diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-04 14:38:38 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-04 14:39:54 +0200 |
| commit | bb7b2bc4fac028642b6021662393b37e44d8e71a (patch) | |
| tree | 7b39e86885666d1bc3e19a94e929f08078ccce6f /dev-util/cmake/files | |
| parent | 787c8708cddb735c1b895bbd7b633d3b1fda8d48 (diff) | |
| download | kde-bb7b2bc4fac028642b6021662393b37e44d8e71a.tar.gz kde-bb7b2bc4fac028642b6021662393b37e44d8e71a.tar.bz2 kde-bb7b2bc4fac028642b6021662393b37e44d8e71a.zip | |
remove cmake stuff. it is in the tree.
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-FindJNI.patch | 71 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonInterp.patch | 12 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonLibs.patch | 13 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake.vim | 3 |
5 files changed, 0 insertions, 103 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-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 f70d4f83d35..00000000000 --- a/dev-util/cmake/files/cmake-FindPythonInterp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur cmake-2.6.2.orig/Modules/FindPythonInterp.cmake cmake-2.6.2/Modules/FindPythonInterp.cmake ---- cmake-2.6.2.orig/Modules/FindPythonInterp.cmake 2008-09-24 20:34:34.000000000 +0200 -+++ cmake-2.6.2/Modules/FindPythonInterp.cmake 2009-01-03 19:54:21.000000000 +0100 -@@ -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.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 f473cffd9d1..00000000000 --- a/dev-util/cmake/files/cmake-FindPythonLibs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Modules/FindPythonLibs.cmake 2008-05-08 11:18:22.000000000 -0400 -+++ Modules/FindPythonLibs.cmake 2008-05-08 11:18:40.000000000 -0400 -@@ -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.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 |
