diff options
| author | Johannes Huber <johu@gentoo.org> | 2012-05-02 23:12:29 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-05-02 23:12:29 +0200 |
| commit | e011152254bc7c27f6d5ebcede5dae420644c5fe (patch) | |
| tree | ae51736b840f99db3c7e392139f7ce1e34ddf0df /dev-util/cmake/files | |
| parent | 2fee0a8bc0bbc36510d489a1f67978e9c1a19eb0 (diff) | |
| download | kde-e011152254bc7c27f6d5ebcede5dae420644c5fe.tar.gz kde-e011152254bc7c27f6d5ebcede5dae420644c5fe.tar.bz2 kde-e011152254bc7c27f6d5ebcede5dae420644c5fe.zip | |
[dev-util/cmake] Moved to tree.
(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)
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.3-darwin-bundle.patch | 23 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch | 20 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch | 110 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake.vim | 3 |
14 files changed, 0 insertions, 518 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.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch deleted file mode 100644 index 6ee9b709dff..00000000000 --- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch +++ /dev/null @@ -1,23 +0,0 @@ -Don't use .so for modules on darwin/macos. Use .bundle instead. -Patch by Heiko Przybyl - ---- Modules/Platform/Darwin.cmake -+++ Modules/Platform/Darwin.cmake -@@ -23,7 +23,7 @@ - SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") - SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") - SET(CMAKE_SHARED_MODULE_PREFIX "lib") --SET(CMAKE_SHARED_MODULE_SUFFIX ".so") -+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle") - SET(CMAKE_MODULE_EXISTS 1) - SET(CMAKE_DL_LIBS "") - -@@ -45,7 +45,7 @@ - SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") - SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") - SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") --SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") -+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") - - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch deleted file mode 100644 index 02c3011c8f7..00000000000 --- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://public.kitware.com/Bug/view.php?id=7933 - -diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx ---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 -+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 -@@ -38,6 +38,13 @@ - int main() { return 0; } - #endif - -+#ifdef TEST_KWSYS_LFS_SUPPORT -+#define _LARGE_FILES -+#include <iostream> -+int main() { return 0; } -+#endif -+ -+ - #ifdef TEST_KWSYS_IOS_HAVE_STD - #include <iosfwd> - void f(std ::ostream*) {} -diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap ---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 -+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 -@@ -1005,6 +1005,16 @@ - echo "${cmake_cxx_compiler} does not have stl iterator_traits" - fi - -+if cmake_try_run "${cmake_cxx_compiler}" \ -+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ -+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then -+ KWSYS_LFS_AVAILABLE=1 -+ echo "LFS support available" -+else -+ KWSYS_LFS_AVAILABLE=0 -+ echo "LFS support unavailable, disabled" -+fi -+ - if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch deleted file mode 100644 index ceb205ff586..00000000000 --- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch by Heiko Przybyl - ---- Source/cmComputeLinkInformation.cxx -+++ Source/cmComputeLinkInformation.cxx -@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge - for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); - ri != runtimeDirs.end(); ++ri) - { -+ // Do not add duplicates. -+ // I'd like to have that check already in the list generation code -+ // but that would need lots of more changes, even in ExpandListArgument(). -+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) -+ { -+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; -+ continue; -+ } - // Separate from previous path. - rpath += sep; - sep = this->GetRuntimeSep().c_str(); diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch deleted file mode 100644 index 4ef0c7b4b6f..00000000000 --- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch +++ /dev/null @@ -1,20 +0,0 @@ -The install_name of a library can be compared to the ELF soname, setting -it to just the library name (libx.1.dylib) is not sufficient on Mach-O, -as it uses full paths. Most apps have no clue about that, so they don't -do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html - -Provide a sane default that will allow merging most cmake-based -packages. If this location is not correct, Portage's QA checks will -catch that. - ---- Source/cmTarget.cxx -+++ Source/cmTarget.cxx -@@ -974,7 +974,7 @@ - this->Makefile->IsOn("MINGW")); - - // Setup default property values. -- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); -+ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); - this->SetPropertyDefault("INSTALL_RPATH", ""); - this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); - this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); diff --git a/dev-util/cmake/files/cmake-2.8.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch deleted file mode 100644 index 87c724776e5..00000000000 --- a/dev-util/cmake/files/cmake-2.8.1-libform.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt ---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100 -+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200 -@@ -314,9 +314,6 @@ - ELSE (UNIX) - SET(BUILD_CursesDialog 0) - ENDIF (UNIX) -- IF(BUILD_CursesDialog) -- ADD_SUBDIRECTORY(Source/CursesDialog/form) -- ENDIF(BUILD_CursesDialog) - ENDMACRO (CMAKE_BUILD_UTILITIES) - - -diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt ---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100 -+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200 -@@ -25,13 +25,18 @@ - CursesDialog/ccmake - ) - --INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form -- ${CMake_BINARY_DIR}/Source/CursesDialog/form) - INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) - - - ADD_EXECUTABLE(ccmake ${CURSES_SRCS} ) - TARGET_LINK_LIBRARIES(ccmake CMakeLib) --TARGET_LINK_LIBRARIES(ccmake cmForm) -+TARGET_LINK_LIBRARIES(ccmake form) -+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) -+IF(CURSES_EXTRA_LIBRARY) -+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) -+ENDIF(CURSES_EXTRA_LIBRARY) -+ - - INSTALL_TARGETS(/bin ccmake) -+ -+ -diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h ---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100 -+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200 -@@ -15,8 +15,6 @@ - #define _MSE_INT_H - #endif - --#include <cmFormConfigure.h> -- - #if defined(__hpux) - # define _BOOL_DEFINED - # include <sys/time.h> diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch deleted file mode 100644 index 28d2e4f8790..00000000000 --- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake ---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100 -+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100 -@@ -33,6 +33,8 @@ - ${Python_ADDITIONAL_VERSIONS} - 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - -+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" -+ OUTPUT_VARIABLE _Python_VERSIONS) - FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch deleted file mode 100644 index a91214c1a90..00000000000 --- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ruN cmake-2.8.7.orig/Modules/FindBLAS.cmake cmake-2.8.7/Modules/FindBLAS.cmake ---- cmake-2.8.7.orig/Modules/FindBLAS.cmake 2011-12-30 17:49:56.000000000 +0100 -+++ cmake-2.8.7/Modules/FindBLAS.cmake 2012-03-08 05:38:47.000000000 +0100 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration for blas is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find BLAS library - # This module finds an installed fortran library that implements the BLAS - # linear-algebra interface (see http://www.netlib.org/blas/). -@@ -39,6 +45,24 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_BLAS blas) -+if(PC_BLAS_FOUND) -+ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) -+ mark_as_advanced(BLAS_LIBRARIES) -+else(PC_BLAS_FOUND) -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") -+ - include(CheckFunctionExists) - include(CheckFortranFunctionExists) - -@@ -622,3 +646,6 @@ - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(PC_BLAS_FOUND) -+ diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch deleted file mode 100644 index edaa91ffdb0..00000000000 --- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -953,6 +953,11 @@ - set( _boost_docstring_release "Boost ${COMPONENT} library (release)") - set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") - -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass. -+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi) -+ endif() -+ - # - # Find RELEASE libraries - # -@@ -962,6 +967,14 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") - list(APPEND _boost_RELEASE_NAMES -@@ -969,6 +982,13 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) -@@ -994,6 +1014,15 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}boost_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") - list(APPEND _boost_DEBUG_NAMES -@@ -1001,6 +1030,13 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch deleted file mode 100644 index 6808b80ae50..00000000000 --- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake ---- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100 -+++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find LAPACK library - # This module finds an installed fortran library that implements the LAPACK - # linear-algebra interface (see http://www.netlib.org/lapack/). -@@ -36,6 +42,24 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_LAPACK lapack) -+if(PC_LAPACK_FOUND) -+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) -+ mark_as_advanced(LAPACK_LIBRARIES) -+else(PC_LAPACK_FOUND) -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") -+ - set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - - get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) -@@ -305,3 +329,5 @@ - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(PC_LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch deleted file mode 100644 index c5e17c5ba64..00000000000 --- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake -index c47f583..5783d37 100644 ---- a/Modules/FindPkgConfig.cmake -+++ b/Modules/FindPkgConfig.cmake -@@ -87,7 +87,12 @@ - set(PKG_CONFIG_VERSION 1) - set(PKG_CONFIG_FOUND 0) - --find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -+if(NOT PKG_CONFIG_EXECUTABLE) -+ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) -+ if(NOT PKG_CONFIG_EXECUTABLE) -+ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -+ endif(NOT PKG_CONFIG_EXECUTABLE) -+endif(NOT PKG_CONFIG_EXECUTABLE) - mark_as_advanced(PKG_CONFIG_EXECUTABLE) - - if(PKG_CONFIG_EXECUTABLE) diff --git a/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch deleted file mode 100644 index ca768351727..00000000000 --- a/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch +++ /dev/null @@ -1,110 +0,0 @@ -Set some proper paths to make cmake find our tools. -Original patch by Heiko Przybyl, updated for cmake-2.8.8 by Chris Reffett - -The ebuild now adds an extra / at the end of $EPREFIX so that it is -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains -correct) - ---- cmake-2.8.8/Modules/Platform/Darwin.cmake -+++ cmake-2.8.8/Modules/Platform/Darwin.cmake -@@ -229,20 +229,24 @@ - - - --# default to searching for frameworks first --SET(CMAKE_FIND_FRAMEWORK FIRST) -+# default to searching for frameworks last -+SET(CMAKE_FIND_FRAMEWORK LAST) - # set up the default search directories for frameworks - SET(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - /Library/Frameworks - /Network/Library/Frameworks - /System/Library/Frameworks) - --# default to searching for application bundles first --SET(CMAKE_FIND_APPBUNDLE FIRST) -+# default to searching for application bundles last -+SET(CMAKE_FIND_APPBUNDLE LAST) - # set up the default search directories for application bundles - SET(_apps_paths) - FOREACH(_path -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - "~/Applications" - "/Applications" - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ -diff -ruN cmake-2.8.8.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.8/Modules/Platform/UnixPaths.cmake ---- cmake-2.8.8/Modules/Platform/UnixPaths.cmake -+++ cmake-2.8.8/Modules/Platform/UnixPaths.cmake -@@ -33,6 +33,7 @@ - # search types. - LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ - /usr/local /usr / - - # CMake install location -@@ -44,43 +45,39 @@ - - # List common include file locations not under the common prefixes. - LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - ) - - LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - /lib /usr/lib /usr/lib32 /usr/lib64 - ) - - LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch deleted file mode 100644 index 64af9d31443..00000000000 --- a/dev-util/cmake/files/cmake-2.8.8-tests.patch +++ /dev/null @@ -1,58 +0,0 @@ -Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root ---- cmake-2.8.8/Tests/CMakeLists.txt -+++ cmake-2.8.8/Tests/CMakeLists.txt -@@ -273,23 +273,6 @@ - ) - LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities") - -- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities) -- # this test also depends on the existence of the standard qtiff plugin -- if(QT4_WORKS AND QT_QTSQL_FOUND) -- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND} -- --build-and-test -- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy" -- "${CMake_BINARY_DIR}/Tests/Qt4Deploy" -- --build-generator ${CMAKE_TEST_GENERATOR} -- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} -- --build-project Qt4Deploy -- --build-options -- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -- ) -- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy") -- endif() -- - endif() - endif() - -@@ -1548,30 +1531,6 @@ - LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}") - ENDIF(Subversion_FOUND) - -- # Test CTest Update with CVS -- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) -- FIND_PACKAGE(CVS QUIET) -- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) -- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs) -- SET(CVS_FOUND ${CVS_EXECUTABLE}) -- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) -- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND}) -- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) -- IF("${CVS_EXECUTABLE}" MATCHES "cygwin") -- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!") -- SET(CTEST_TEST_UPDATE_CVS 0) -- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin") -- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) -- IF(CTEST_TEST_UPDATE_CVS) -- SET(CTestUpdateCVS_DIR "CTest UpdateCVS") -- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY) -- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND} -- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" -- ) -- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}") -- ENDIF(CTEST_TEST_UPDATE_CVS) -- - # Test CTest Update with BZR - FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr) - MARK_AS_ADVANCED(BZR_EXECUTABLE) 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 |
