[dev-util/cmake] Fix detection of newer imagemagic wrt bug #465898. Remove old.

Package-Manager: portage-2.1.11.62

5 files changed, 34 insertions, 391 deletions

diff --git a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
deleted file mode 100644
index 88927a3238b..00000000000
--- a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Tue, 6 Nov 2012 23:35:34 +1100
-Subject: [PATCH] Set some proper paths to make cmake find our tools.
-
-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)
-
-Original patch by Heiko Przybyl.
-Updated by Chris Reffett (cmake-2.8.8)
-Updated by Johannes Huber (cmake-2.8.9)
-Updated by Michael Palimaka (cmake-2.8.10)
----
- Modules/Platform/Darwin.cmake    | 12 +++++++----
- Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
- 2 files changed, 29 insertions(+), 26 deletions(-)
-
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index a401762..775e547 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
-@@ -251,24 +251,28 @@ set(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
-       "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
- 
- 
--# default to searching for frameworks first
-+# default to searching for frameworks last
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
--  set(CMAKE_FIND_FRAMEWORK FIRST)
-+  set(CMAKE_FIND_FRAMEWORK LAST)
- endif()
- # 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
-+# default to searching for application bundles last
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
--  set(CMAKE_FIND_APPBUNDLE FIRST)
-+  set(CMAKE_FIND_APPBUNDLE LAST)
- endif()
- # 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 --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index ccb2663..0501d53 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # 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,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- 
- # 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/libx32
-+  @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
--  /lib /usr/lib /usr/lib32 /usr/lib64
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-+  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
-   )
- 
- 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
-   )
- 
--- 
-1.8.0
-
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch b/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch
deleted file mode 100644
index f0ea5e81461..00000000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- a/Source/cmLocalGenerator.cxx
-+++ b/Source/cmLocalGenerator.cxx
-@@ -1329,7 +1329,9 @@ std::string cmLocalGenerator::GetIncludeFlags(
- void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
-                                              cmGeneratorTarget* target,
-                                              const char* lang,
--                                             const char *config)
-+                                             const char *config,
-+                                             bool stripImplicitInclDirs
-+                                            )
- {
-   // Need to decide whether to automatically include the source and
-   // binary directories at the beginning of the include path.
-@@ -1404,18 +1406,21 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
-     return;
-     }
- 
--  // Load implicit include directories for this language.
--  std::string impDirVar = "CMAKE_";
--  impDirVar += lang;
--  impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES";
--  if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str()))
-+  if (stripImplicitInclDirs)
-     {
--    std::vector<std::string> impDirVec;
--    cmSystemTools::ExpandListArgument(value, impDirVec);
--    for(std::vector<std::string>::const_iterator i = impDirVec.begin();
--        i != impDirVec.end(); ++i)
-+    // Load implicit include directories for this language.
-+    std::string impDirVar = "CMAKE_";
-+    impDirVar += lang;
-+    impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES";
-+    if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str()))
-       {
--      emitted.insert(*i);
-+      std::vector<std::string> impDirVec;
-+      cmSystemTools::ExpandListArgument(value, impDirVec);
-+      for(std::vector<std::string>::const_iterator i = impDirVec.begin();
-+          i != impDirVec.end(); ++i)
-+        {
-+        emitted.insert(*i);
-+        }
-       }
-     }
- 
---- a/Source/cmLocalGenerator.h
-+++ b/Source/cmLocalGenerator.h
-@@ -212,7 +212,8 @@ public:
-   /** Get the include flags for the current makefile and language.  */
-   void GetIncludeDirectories(std::vector<std::string>& dirs,
-                              cmGeneratorTarget* target,
--                             const char* lang = "C", const char *config = 0);
-+                             const char* lang = "C", const char *config = 0,
-+                             bool stripImplicitInclDirs = true);
- 
-   /** Compute the language used to compile the given source file.  */
-   const char* GetSourceFileLanguage(const cmSourceFile& source);
---- a/Source/cmQtAutomoc.cxx
-+++ b/Source/cmQtAutomoc.cxx
-@@ -212,36 +212,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
-     }
- 
- 
--  const char* qtIncDir = 0;
--  const char* qtCoreIncDir = 0;
--
--  // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs,
--  // see http://public.kitware.com/Bug/view.php?id=13667
--  bool qtIncludeDirMayHaveBeenRemoved = false;
--  if (makefile->IsSet("QT_INCLUDE_DIR"))
--    {
--    qtIncDir = makefile->GetDefinition("QT_INCLUDE_DIR");
--    std::string s =
--         makefile->GetSafeDefinition("CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES");
--    std::vector<std::string> implIncDirs;
--    cmSystemTools::ExpandListArgument(s, implIncDirs);
--    if (std::find(implIncDirs.begin(), implIncDirs.end(),std::string(qtIncDir))
--                                                          != implIncDirs.end())
--      {
--      qtIncludeDirMayHaveBeenRemoved = true;
--      if (makefile->IsSet("QT_QTCORE_INCLUDE_DIR"))
--        {
--        qtCoreIncDir = makefile->GetDefinition("QT_QTCORE_INCLUDE_DIR");
--        }
--      }
--    }
--
--  bool haveQtCoreIncDir = false;
--  bool haveQtIncDir = false;
--
-   std::vector<std::string> includeDirs;
-   cmGeneratorTarget gtgt(target);
--  localGen->GetIncludeDirectories(includeDirs, &gtgt, "CXX");
-+  // Get the include dirs for this target, without stripping the implicit
-+  // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
-+  localGen->GetIncludeDirectories(includeDirs, &gtgt, "CXX", 0, false);
-   std::string _moc_incs = "";
-   const char* sep = "";
-   for(std::vector<std::string>::const_iterator incDirIt = includeDirs.begin();
-@@ -251,37 +226,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
-     _moc_incs += sep;
-     sep = ";";
-     _moc_incs += *incDirIt;
--
--    if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir) // #13667
--      {
--      if (*incDirIt == qtIncDir)
--        {
--        haveQtIncDir = true;
--        qtIncludeDirMayHaveBeenRemoved = false; // it's here, i.e. not removed
--        }
--      if (*incDirIt == qtCoreIncDir)
--        {
--        haveQtCoreIncDir = true;
--        }
--      }
--    }
--
--  // Some projects (kdelibs, phonon) query the compiler for its default
--  // include search dirs, and add those to
--  // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
--  // These may include e.g./usr/lib/qt/include . This is typically also part
--  // of ${QT_INCLUDES}. If this directory is then contained in the implicit
--  // include dirs, it is removed from the include dirs returned from the
--  // target above. So we add ${QT_INCLUDE_DIR} manually for moc if we detected
--  // that ${QT_QTCORE_INCLUDE_DIR} is among the include dirs (there shouldn't
--  // be a way to use Qt4 without using ${QT_QTCORE_INCLUDE_DIR} I think.
--  // See #13646 and #13667.
--  if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir
--      && (haveQtCoreIncDir == true) && (haveQtIncDir == false))
--    {
--    _moc_incs += sep;
--    sep = ";";
--    _moc_incs += qtIncDir;
-     }
- 
-   const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
--- 
-1.7.0
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch
new file mode 100644
index 00000000000..f5b70c1f47f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/show_bug.cgi?id=465898
+
+--- Modules/FindImageMagick.cmake
++++ Modules/FindImageMagick.cmake
+@@ -81,7 +81,7 @@
+       ${ImageMagick_INCLUDE_DIRS}
+       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
+     PATH_SUFFIXES
+-      ImageMagick
++      ImageMagick ImageMagick-6
+     DOC "Path to the ImageMagick include dir."
+     )
+   find_library(ImageMagick_${component}_LIBRARY
+@@ -147,17 +147,17 @@
+     )
+   if(component STREQUAL "Magick++")
+     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
+-      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8
++      Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
+   elseif(component STREQUAL "MagickWand")
+     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
+-      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8
++      Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
+   elseif(component STREQUAL "MagickCore")
+     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
+-      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8
++      Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
+   else()
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})