This is an automated email from the ASF dual-hosted git repository.
asekretenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new 362bf9b Added cmake install for missing build-time module
dependencies.
362bf9b is described below
commit 362bf9bc507a5a0c1d0360a9bf0057a11116f95e
Author: Andrei Sekretenko <[email protected]>
AuthorDate: Tue Jun 2 18:33:30 2020 +0200
Added cmake install for missing build-time module dependencies.
Review: https://reviews.apache.org/r/72561
---
3rdparty/CMakeLists.txt | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 445c45f..3359131 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -227,6 +227,12 @@ if ("${BOOST_ROOT_DIR}" STREQUAL "")
INSTALL_COMMAND ${CMAKE_NOOP}
URL ${BOOST_URL}
URL_HASH ${BOOST_HASH})
+
+ if (ENABLE_INSTALL_MODULE_DEPENDENCIES)
+ install(
+ DIRECTORY ${BOOST_ROOT}/
+ DESTINATION ${MESOS_INSTALL_HEADERS})
+ endif ()
else ()
add_library(boost INTERFACE)
target_include_directories(boost INTERFACE ${BOOST_ROOT_DIR}/include)
@@ -1663,6 +1669,11 @@ if (ENABLE_INSTALL_MODULE_DEPENDENCIES)
${ZOOKEEPER_CMAKE_ROOT}/src/zookeeper-${ZOOKEEPER_VERSION}/src/c/include/zookeeper_version.h
${ZOOKEEPER_CMAKE_ROOT}/src/zookeeper-${ZOOKEEPER_VERSION}/src/c/include/zookeeper.h
DESTINATION ${MESOS_INSTALL_HEADERS}/zookeeper)
+
+ # NOTE: `zookeeper` is always built statically, hence it is always installed
+ # into ${MESOS_INSTALL_LIBRARIES}, even on Windows.
+ install(FILES $<TARGET_FILE:zookeeper> DESTINATION
${MESOS_INSTALL_LIBRARIES})
+ install(FILES $<TARGET_FILE:zk-hashtable> DESTINATION
${MESOS_INSTALL_LIBRARIES})
endif ()
# LevelDB: A fast key-value storage library.