This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new 30b245a PROTON-2254, PROTON-2433 Fixes to 'modern' CMake installed
targets (#334)
30b245a is described below
commit 30b245a48d7461fd41854e5bb63eadf19cbb26bd
Author: Jiri Daněk <[email protected]>
AuthorDate: Fri Sep 17 23:28:10 2021 +0200
PROTON-2254, PROTON-2433 Fixes to 'modern' CMake installed targets (#334)
* PROTON-2433 Set include directories on the modern CMake targets, removed
by mistake in PROTON-2254
* PROTON-2254 Give the static Targets.cmake file a correct name
---
c/CMakeLists.txt | 12 ++++++++----
cpp/CMakeLists.txt | 8 +++++---
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
index bb59859..f505ff8 100644
--- a/c/CMakeLists.txt
+++ b/c/CMakeLists.txt
@@ -507,13 +507,15 @@ install(TARGETS qpid-proton qpid-proton-core
EXPORT ProtonTargets
RUNTIME DESTINATION bin
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR})
if (BUILD_STATIC_LIBS)
install(TARGETS qpid-proton-static qpid-proton-core-static
EXPORT ProtonTargetsStatic
RUNTIME DESTINATION bin
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR})
endif()
# Install windows pdb files
@@ -531,13 +533,15 @@ if (HAS_PROACTOR)
EXPORT ProtonTargets
RUNTIME DESTINATION bin
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR})
if (BUILD_STATIC_LIBS)
install(TARGETS qpid-proton-proactor-static
EXPORT ProtonTargetsStatic
RUNTIME DESTINATION bin
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR})
endif()
# Install windows pdb files
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 5773234..0376461 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -138,13 +138,15 @@ install(TARGETS qpid-proton-cpp
EXPORT ProtonCppTargets
RUNTIME DESTINATION bin
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR})
if (BUILD_STATIC_LIBS)
install(TARGETS qpid-proton-cpp-static
EXPORT ProtonCppStaticTargets
RUNTIME DESTINATION bin
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR})
endif ()
# Install windows qpid-proton-cpp pdb files
@@ -189,7 +191,7 @@ install(EXPORT ProtonCppTargets
DESTINATION ${LIB_INSTALL_DIR}/cmake/ProtonCpp)
if (BUILD_STATIC_LIBS)
install(EXPORT ProtonCppStaticTargets
- FILE ProtonCppTargets.cmake
+ FILE ProtonCppTargetsStatic.cmake
NAMESPACE Proton::
DESTINATION ${LIB_INSTALL_DIR}/cmake/ProtonCpp)
endif ()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
