Mercurial > irccd

changeset 886:dabbe1b20702 release-3.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmake: fix RPATH handling, closes #2257
author David Demelier <markand@malikania.fr>
date Sun, 01 Sep 2019 17:21:32 +0200
parents cb7532847b08
children d1cfe59eed06
files CHANGES.md cmake/function/IrccdDefineExecutable.cmake irccd-test/CMakeLists.txt
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES.md	Sat Aug 31 21:44:02 2019 +0200
+++ b/CHANGES.md	Sun Sep 01 17:21:32 2019 +0200
@@ -5,7 +5,8 @@
 ----------------------
 
 - Fixed an invalid template escape sequence (#2250),
-- Updated the default configuration files (#2249).
+- Updated the default configuration files (#2249),
+- Fix RPATH handling for private libraries like Duktape (#2257).
 
 irccd 3.0.0 2019-08-15
 ----------------------
--- a/cmake/function/IrccdDefineExecutable.cmake	Sat Aug 31 21:44:02 2019 +0200
+++ b/cmake/function/IrccdDefineExecutable.cmake	Sun Sep 01 17:21:32 2019 +0200
@@ -68,9 +68,12 @@
 	target_compile_options(${EXE_TARGET} PRIVATE ${EXE_OPTIONS})
 	target_link_libraries(${EXE_TARGET} ${EXE_LIBRARIES})
 
+	file(RELATIVE_PATH RPATH ${CMAKE_INSTALL_FULL_BINDIR} ${CMAKE_INSTALL_FULL_LIBDIR}/irccd)
+
 	set_target_properties(
 		${EXE_TARGET}
 		PROPERTIES
+			INSTALL_RPATH "$ORIGIN/${RPATH}"
 			CXX_STANDARD 17
 			CXX_STANDARD_REQUIRED On
 			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
--- a/irccd-test/CMakeLists.txt	Sat Aug 31 21:44:02 2019 +0200
+++ b/irccd-test/CMakeLists.txt	Sun Sep 01 17:21:32 2019 +0200
@@ -27,6 +27,7 @@
 
 irccd_define_executable(
 	TARGET irccd-test
+	EXPORT
 	LIBRARIES libirccd-test ${LIBRARIES}
 	INCLUDES ${INCLUDES}
 	DESCRIPTION "Plugin tester"