You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2021/08/12 19:15:45 UTC
[qpid-proton] branch jd_2021_05_13_PROTON-yyyy_static created (now
fb92daf)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a change to branch jd_2021_05_13_PROTON-yyyy_static
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git.
at fb92daf PROTON-2254 Allow absolute -DINCLUDE_INSTALL_DIR=
This branch includes the following new commits:
new fb92daf PROTON-2254 Allow absolute -DINCLUDE_INSTALL_DIR=
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-proton] 01/01: PROTON-2254 Allow absolute
-DINCLUDE_INSTALL_DIR=
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch jd_2021_05_13_PROTON-yyyy_static
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit fb92dafb845980b1bdd7315bf950141576846b15
Author: Jiri Danek <jd...@redhat.com>
AuthorDate: Thu Aug 12 21:11:17 2021 +0200
PROTON-2254 Allow absolute -DINCLUDE_INSTALL_DIR=
---
CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aef3b0..ea2d7d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -280,10 +280,11 @@ mark_as_advanced (INCLUDE_INSTALL_DIR LIB_INSTALL_DIR SYSCONF_INSTALL_DIR SHARE_
# by configure_package_config_file(), and available in ProtonConfig.cmake
macro (pn_relative_install_dir NAME VALUE)
if (IS_ABSOLUTE ${VALUE})
- message(FATAL_ERROR "pn_relative_install_dir requires relative directory")
+ message(WARNING "Build was given an absolute path '${VALUE}', install dir will not be relocatable.")
+ set (${NAME} "${VALUE}")
+ else ()
+ set (${NAME} "\${PACKAGE_PREFIX_DIR}/${VALUE}")
endif ()
-
- set (${NAME} "\${PACKAGE_PREFIX_DIR}/${VALUE}")
endmacro ()
pn_relative_install_dir (INCLUDEDIR ${INCLUDE_INSTALL_DIR})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org