From ca5aab1344b07d37b947ae713da8357e9d85d33f Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Fri, 2 Sep 2022 17:40:14 +0200 Subject: [PATCH] @rpath in plugin --- CMakeLists.txt | 2 ++ xplugin/CMakeLists.txt | 13 ++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba9aab7..ec3f054 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.8) +cmake_policy(SET CMP0068 NEW) project(GermanAirlinesVA_GAConnector) @@ -6,6 +7,7 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR TRUE) set(PLUGIN_NAME GAConnector) option(DEBUG "Debug symbols" OFF) diff --git a/xplugin/CMakeLists.txt b/xplugin/CMakeLists.txt index 7d23add..b27e2d4 100644 --- a/xplugin/CMakeLists.txt +++ b/xplugin/CMakeLists.txt @@ -55,13 +55,12 @@ endif() if(APPLE) message("Building for MacOSX Universal into ${PROJECT_BINARY_DIR}/${PLUGIN_NAME}/${BIT}") - + set_target_properties(germanairlinesva_xplugin PROPERTIES - NO_SONAME 1 LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME} OUTPUT_NAME mac ) - + target_compile_definitions(germanairlinesva_xplugin PUBLIC APL ) @@ -79,13 +78,13 @@ if(APPLE) ) elseif(UNIX) message("Building for Linux ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}") - + set_target_properties(germanairlinesva_xplugin PROPERTIES NO_SONAME 1 LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT} OUTPUT_NAME lin ) - + target_compile_definitions(germanairlinesva_xplugin PUBLIC LIN ) @@ -106,12 +105,12 @@ elseif(UNIX) ) elseif(WIN32) message("Building for Windows ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}") - + set_target_properties(germanairlinesva_xplugin PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT} OUTPUT_NAME win ) - + target_compile_definitions(germanairlinesva_xplugin PUBLIC IBM )