diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2019-08-19 08:15:10 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2019-08-19 08:15:10 +0000 |
| commit | 6817f6bcdc9d8e23365c64777bf4e91e83397194 (patch) | |
| tree | da655aa2ca77c28f3d4aaaff972bf2f210631c57 /net/ceph13/files/patch-CMakeLists.txt | |
| parent | math/rumur: Update 2019.07.21 -> 2019.08.18 (diff) | |
net/ceph13: upgrade 13.2.1 -> 13.2.6
PR: 239958
Submitted by: Willem Jan Withagen <wjw@digiware.nl> (maintainer)
Relnotes: https://ceph.io/releases/v13-2-6-mimic-released/
Notes
Notes:
svn path=/head/; revision=509257
Diffstat (limited to 'net/ceph13/files/patch-CMakeLists.txt')
| -rw-r--r-- | net/ceph13/files/patch-CMakeLists.txt | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/net/ceph13/files/patch-CMakeLists.txt b/net/ceph13/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..0b9835ccda90 --- /dev/null +++ b/net/ceph13/files/patch-CMakeLists.txt @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d1dd93bd64..0defd394fb 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -21,6 +21,9 @@ endif() + if(POLICY CMP0051) + cmake_policy(SET CMP0051 NEW) + endif() ++if(POLICY CMP0075) ++ cmake_policy(SET CMP0075 NEW) ++endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") + + if(CMAKE_SYSTEM_NAME MATCHES "Linux") +@@ -46,15 +49,6 @@ if(WITH_CCACHE) + endif(CCACHE_FOUND) + endif(WITH_CCACHE) + +-option(WITH_MANPAGE "Build man pages." ON) +-if(WITH_MANPAGE) +- find_program(SPHINX_BUILD +- sphinx-build) +- if(NOT SPHINX_BUILD) +- message(FATAL_ERROR "Can't find sphinx-build.") +- endif(NOT SPHINX_BUILD) +-endif(WITH_MANPAGE) +- + include_directories( + ${PROJECT_BINARY_DIR}/src/include + ${PROJECT_SOURCE_DIR}/src) +@@ -475,9 +469,19 @@ if(WITH_MGR) + set(MGR_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) + set(MGR_PYTHON_LIBRARIES ${PYTHON_LIBRARIES}) + set(MGR_PYTHON_VERSION_MAJOR ${PYTHON_VERSION_MAJOR}) ++ set(MGR_PYTHON_VERSION_MINOR ${PYTHON_VERSION_MINOR}) + # Boost dependency check deferred to Boost section + endif(WITH_MGR) + ++option(WITH_MANPAGE "Build man pages." ON) ++if(WITH_MANPAGE) ++ find_program(SPHINX_BUILD ++ sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) ++ if(NOT SPHINX_BUILD) ++ message(FATAL_ERROR "Can't find sphinx-build.") ++ endif(NOT SPHINX_BUILD) ++endif(WITH_MANPAGE) ++ + option(WITH_THREAD_SAFE_RES_QUERY "res_query is thread safe" OFF) + if(WITH_THREAD_SAFE_RES_QUERY) + set(HAVE_THREAD_SAFE_RES_QUERY 1 CACHE INTERNAL "Thread safe res_query supported.") +@@ -524,6 +528,7 @@ option(ENABLE_COVERAGE "Coverage is enabled" OFF) + option(PG_DEBUG_REFS "PG Ref debugging is enabled" OFF) + + option(WITH_TESTS "enable the build of ceph-test package scripts/binaries" ON) ++option(CTEST_TIMEOUT "Allow customizing the test timeout" 3600) + + # fio + option(WITH_FIO "build with fio plugin enabled" OFF) +@@ -596,7 +601,8 @@ set(BOOST_COMPONENTS + set(BOOST_HEADER_COMPONENTS container) + + if(WITH_MGR) +- list(APPEND BOOST_COMPONENTS python) ++ list(APPEND BOOST_COMPONENTS ++ python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}) + endif() + if(WITH_BOOST_CONTEXT) + list(APPEND BOOST_COMPONENTS context coroutine) |