From 077ae273698c7e0f22e96dc22ac1a2632b4352d4 Mon Sep 17 00:00:00 2001 From: Naram Qashat Date: Tue, 25 Dec 2012 02:20:00 -0500 Subject: Fix linking libraries so their rpath is set correctly and isn't stripped on install. --- modules/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index e1adec666..32fccd2d4 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -76,7 +76,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) else(WIN32) set(WIN32_NO_LIBS) endif(WIN32) - set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${TEMP_LDFLAGS} ${WIN32_NO_LIBS}") + set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${TEMP_LDFLAGS} ${WIN32_NO_LIBS}" INSTALL_RPATH_USE_LINK_PATH ON BUILD_WITH_INSTALL_RPATH ON) add_dependencies(${SO} ${PROGRAM_NAME}) target_link_libraries(${SO} ${PROGRAM_NAME}) if(GETTEXT_FOUND) @@ -179,7 +179,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) # Generate the module and set it's linker flags, also set it to depend on the main Anope executable to be built beforehand add_library(${SO} MODULE ${MODULES_SUBDIR_SRCS}) - set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${SUBDIR_LDFLAGS}") + set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${SUBDIR_LDFLAGS}" INSTALL_RPATH_USE_LINK_PATH ON BUILD_WITH_INSTALL_RPATH ON) add_dependencies(${SO} ${PROGRAM_NAME}) target_link_libraries(${SO} ${PROGRAM_NAME}) if(GETTEXT_FOUND) -- cgit