diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
commit | 6b933047f46efec1aa747570f945344254227457 (patch) | |
tree | a12a4b87b38f954c4de435272cf4b90d721df5e8 /dev-util/cmake | |
parent | f45955e60d4da9b7f4a1088c98042f9c06669039 (diff) |
gentoo resync : 15.12.2017
Diffstat (limited to 'dev-util/cmake')
-rw-r--r-- | dev-util/cmake/Manifest | 7 | ||||
-rw-r--r-- | dev-util/cmake/cmake-3.10.1.ebuild (renamed from dev-util/cmake/cmake-3.9.5.ebuild) | 3 | ||||
-rw-r--r-- | dev-util/cmake/cmake-3.7.2.ebuild | 200 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 |
4 files changed, 3 insertions, 300 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 2d9c0efcfac8..99a9b5e3feee 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -2,7 +2,6 @@ AUX 50cmake-gentoo.el 244 BLAKE2B 1a6c7919b020b3e590a67a9a37f5afd7a56e9970274987 AUX cmake-2.8.10.2-FindPythonLibs.patch 990 BLAKE2B af80335e802c198287315da4ebce193d81ceec00a1e13ec084b80bc3f3df5fb9158765c3bc02d4ed9f6972b77e66c712dd8292c12aa4aca78d178e96943639ee SHA512 c2027439ef5f53991f99db4c60f62e0164641ffce58bfbe0dd9a0b4f93f8b96f6f6e30715a3ab57a47ea7a85d7d784ad602ca74ce88b5bca1a08c538dcc9676f AUX cmake-2.8.12.1-FindImageMagick.patch 1704 BLAKE2B 6ca77ae11d4ace3cc7177f4dcd6f78d4071ab3b13fab6e57b2f46030f009ec6c6dcdefeacaa550f340f77e307f8f43ad3b5df99ac2cf57606aacbe2a7aa4882e SHA512 d27d80a64a19f428cbc50e4c82330ed841e41787669a3f58565e7ade1e208938a35b35e14788b45bfca22aa2fa151655c9bc1bed9c3b20fedf7f71df45083408 AUX cmake-3.0.0-FindBLAS.patch 1581 BLAKE2B 62493ac0ed23748be1913a919d88937c929e29a587a880335caa895c3e9046577f7978c6d85d3ed37762932b812aca407339679c4b917cceb85323130d07e79c SHA512 c73533071df93975a2dc9ba1e17fb16bd396ec816ec9b2b4b714923ea6db606baea82c378bb50d7bb9d918e54c661489265e1032b24d03b2ba924489d01510f7 -AUX cmake-3.0.0-FindBoost-python.patch 6481 BLAKE2B f4d779689b2d9d33234dbd06fe71c1d5eefda071cadf1f8f1eb2a95c1ce746d04c5f328baf9dd0b21c6ce25ba044c33aec3d71b3e79f0c7f3f9cad305e5caec5 SHA512 4eed678c74af89e249de7202c553825cfd0132b84d605d078c388224a1add76acef778f366bb60e52e58e9ca25a23e18f8f6bef7385a9180fb1cab7d7698ffbf AUX cmake-3.0.0-prefix-dirs.patch 4279 BLAKE2B 86f5b3a0f79c4126aa105eb27887b7bc4721360af596b2f0487510bb14454e4618e3230158373f836be6bdd388e4df8fb073558ae1f0fc6b373ea84eddae4cf5 SHA512 f90b2114aa84509fe3763d5c2d29460c84334aedc48f1856e646d7118a80ece72b57084f9ee7e8669ce59d61337d967e8d01f6a68b7d3580f2230a804a0ab2ee AUX cmake-3.0.2-FindLAPACK.patch 1369 BLAKE2B dea4b1299253ae61a24794de0168e869b7ae2f97392229905f47974deab148ba77eac04a6f77574be8a161eb673fd88b28187597bb9d47efd772a3b3177eafad SHA512 4f20c4475841201c28ad49539fe896345add626dad5615357ff01817e10f7315ffe39e3a8d4bd0270179d7c58e5679a5bd9ae2accc1019ecee91db380ba48577 AUX cmake-3.1.0-FindPythonInterp.patch 1045 BLAKE2B 5421ea6600f6b47a654d7dbd5571d284eb2b2c505cb57c0d5862c859f9e6d61fa39ccd19467dffdf8f7200b469ec9e058e0e5bd8d608ff98dc02cedc18f5f85e SHA512 ec89a5589b70427c5d8d7a7b23ee87e3b437973081595f6387b5e7d902014b089f85b3634a906c5aa688726ff0f7588c7fb06161009e044813553c03409cabc0 @@ -15,13 +14,11 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf DIST cmake-3.10.0.tar.gz 7822668 BLAKE2B 8d649924281b68add8120c8f8a4871e0a0671316ce51cc9dcc557d06e696e6f08cf90c253c3edaa902fabc7a9b121ce095e9eaf37478feac1a1cf25555dbc503 SHA512 0bf05f5aacb17007d5beb0909263e31717102b685701eef45c20408895cc9dfd54c96ebc8eee148845c8ffb1d3db687e68a58d4e08395425e14ca0413ee84765 -DIST cmake-3.7.2.tar.gz 7361593 BLAKE2B 92d406236488028ba4a75d8935c66f2e11cc45a81786bd53bdcab039a8174f5dea44553646c18d4c2a840e66695b94b6f5524bed8ce4b8a28f6fcf69b2a08d8f SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d +DIST cmake-3.10.1.tar.gz 7824043 BLAKE2B 004149841b128288845c2a3987b38e6d90b3dcc5ccb2002bc2915f9d8f30496ebf43d9a70fa6e26c7b64c0f41d85c753bd1bac8c1b5d7148b1d592dc98de189a SHA512 14e9a7f01747b369cad3c4e4e83bc777c0c98ce69209456f60d086d2471302f66dc1c1d22fd04e11dcb64de4bfc7dacd9aca70ee0e5f006abd1df79ef642eeed DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1 SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f -DIST cmake-3.9.5.tar.gz 7705155 BLAKE2B d2d723574bff80e481ccbbe279ebce3d84a7049163d401a8dc965bd2f9e32dc3a9eb97e55721368d4edbd1b9d6db3ca4fd459dc9b2094f6aee8bf10c6cff273c SHA512 71a0848a0c7048c210fe16fbd2b0c2870bd4c2140098225e94fac13a53059f4ae610139115ab8c153989886baa087d506b9ffbc7b91ddc157b0c85e3223828a0 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c EBUILD cmake-3.10.0.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc -EBUILD cmake-3.7.2.ebuild 5503 BLAKE2B ad017eb39bcdd5c351ae7a745ab7d0e45c6aa7b36da66fd5f2db14af35654efb3bc99dd1ac79f246411d22222156e92dc525d50235db7c46de3d6c846cd6debb SHA512 8c8b96355c6edf0e84e3cf837042922bc5558f8c488e9ef718553c28eef10bf630671b66a6205cf495e22ceb220fb37c2a7ea1926a5271a63f8c402626dffbb5 +EBUILD cmake-3.10.1.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc EBUILD cmake-3.8.2.ebuild 5714 BLAKE2B 3043b071ed597f37a7a07d9613e5010031d64be5849443dec86ba96892d7afd96c6c8b6a210964fa909da360e1ada9bdef47d82f61ac62ac7812455785af1bee SHA512 951eb5e34e58de94697a01c91f45b43f8d1045cef4eb3d9fa3fa9c8a0c36ce66f4f8656cc2e16b3d62d56cf59d4e59af17ab6972ddca87c9e14821b2703fde4c -EBUILD cmake-3.9.5.ebuild 5975 BLAKE2B 966f47861af4e92e2a5a13aa0f05b2c6ebde75a5c6fe78a3b688c6c5c138ccbf3ecc0557ad601d729c86340986c6486efdf6fa245a2161fa9c31bf3ad27bae32 SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c EBUILD cmake-3.9.6.ebuild 5975 BLAKE2B 966f47861af4e92e2a5a13aa0f05b2c6ebde75a5c6fe78a3b688c6c5c138ccbf3ecc0557ad601d729c86340986c6486efdf6fa245a2161fa9c31bf3ad27bae32 SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015 diff --git a/dev-util/cmake/cmake-3.9.5.ebuild b/dev-util/cmake/cmake-3.10.1.ebuild index 48cd86d38774..95dda9d73a6e 100644 --- a/dev-util/cmake/cmake-3.9.5.ebuild +++ b/dev-util/cmake/cmake-3.10.1.ebuild @@ -23,6 +23,7 @@ RDEPEND=" app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 + >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig @@ -33,7 +34,6 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) - server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) " DEPEND="${RDEPEND} @@ -151,7 +151,6 @@ src_configure() { -DSPHINX_HTML=$(usex doc) -DBUILD_CursesDialog="$(usex ncurses)" -DCMake_ENABLE_SERVER_MODE="$(usex server)" - -DCMAKE_USE_LIBUV="$(usex server)" ) if use qt5 ; then diff --git a/dev-util/cmake/cmake-3.7.2.ebuild b/dev-util/cmake/cmake-3.7.2.ebuild deleted file mode 100644 index c6248dac5925..000000000000 --- a/dev-util/cmake/cmake-3.7.2.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/" -SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt5" - -RDEPEND=" - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=dev-libs/libuv-1.0.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # Qt5Autogen, which breaks for unknown reason - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|Qt5Autogen|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_src_prepare - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} - -src_configure() { - # Fix linking on Solaris - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - -DBUILD_CursesDialog="$(usex ncurses)" - ) - - if use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake-utils_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/vim/syntax/cmake.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/vim/indent/cmake.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch deleted file mode 100644 index a6291d2b8500..000000000000 --- a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Thu, 19 Jun 2014 00:17:48 +1000 -Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries - wrt bug #400969. - ---- - Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 41 insertions(+) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index dfd4460..70bfb4f 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - 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") -+ # Get version of Python. -+ if (NOT PYTHON_EXECUTABLE) -+ #if a certain version of python was detected by cmake before use that one -+ set(PYTHON_EXECUTABLE "python") -+ endif (NOT PYTHON_EXECUTABLE) -+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) -+ endif() -+ - # Compute component-specific hints. - set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "") - if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR -@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() -+ - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") - list(APPEND _boost_RELEASE_NAMES -@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${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_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_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}) -@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") - list(APPEND _boost_DEBUG_NAMES -@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${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_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_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}) --- -1.8.5.5 - |