From 91a2ee45254454626b10b36ca65d73da0740b968 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 15 Oct 2017 13:22:29 -0700 Subject: [PATCH] [MacOS] Change CMake installed names to absolute paths from @rpath/... gtk-mac-bundler can't access the executable's rpath list so it can't follow dependencies if they're not in $install_dir/lib from @rpath. Autotools always sets absolute path install names so this should have no adverse affects on other Mac builds. --- CMakeLists.txt | 3 ++- gnucash/gnome-search/CMakeLists.txt | 4 ++++ gnucash/gnome-utils/CMakeLists.txt | 4 ++++ gnucash/html/CMakeLists.txt | 4 ++++ gnucash/import-export/CMakeLists.txt | 4 ++++ gnucash/import-export/aqb/CMakeLists.txt | 4 ++++ gnucash/import-export/bi-import/CMakeLists.txt | 4 ++++ gnucash/import-export/csv-exp/CMakeLists.txt | 4 ++++ gnucash/import-export/csv-imp/CMakeLists.txt | 4 ++++ gnucash/import-export/customer-import/CMakeLists.txt | 4 ++++ gnucash/import-export/log-replay/CMakeLists.txt | 4 ++++ gnucash/import-export/ofx/CMakeLists.txt | 4 ++++ gnucash/import-export/qif-imp/CMakeLists.txt | 4 ++++ gnucash/import-export/qif/CMakeLists.txt | 4 ++++ gnucash/register/ledger-core/CMakeLists.txt | 4 ++++ gnucash/register/register-core/CMakeLists.txt | 4 ++++ gnucash/register/register-gnome/CMakeLists.txt | 4 ++++ gnucash/report/locale-specific/us/CMakeLists.txt | 4 ++++ gnucash/report/report-gnome/CMakeLists.txt | 4 ++++ gnucash/report/report-system/CMakeLists.txt | 4 ++++ gnucash/report/stylesheets/CMakeLists.txt | 4 ++++ libgnucash/app-utils/CMakeLists.txt | 8 ++++++++ libgnucash/backend/dbi/CMakeLists.txt | 4 ++++ libgnucash/backend/xml/CMakeLists.txt | 4 ++++ libgnucash/engine/CMakeLists.txt | 4 ++++ libgnucash/tax/us/CMakeLists.txt | 4 ++++ 26 files changed, 106 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 738b434d54..a940b87e3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -491,9 +491,10 @@ SET( CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS} -Wno-deprecated-declaratio IF (APPLE AND WITH_GNUCASH) SET(CMAKE_MACOSX_RPATH ON) + SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") ENDIF (APPLE AND WITH_GNUCASH) -IF (UNIX AND NOT APPLE) +IF (UNIX) SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/gnucash") ENDIF() diff --git a/gnucash/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt index 5f27601946..36951864bf 100644 --- a/gnucash/gnome-search/CMakeLists.txt +++ b/gnucash/gnome-search/CMakeLists.txt @@ -52,6 +52,10 @@ TARGET_COMPILE_DEFINITIONS(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui. TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-search PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-gnome-search PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-gnome-search LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt index fd5043fa34..4588de8319 100644 --- a/gnucash/gnome-utils/CMakeLists.txt +++ b/gnucash/gnome-utils/CMakeLists.txt @@ -232,6 +232,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-utils ) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-gnome-utils PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-gnome-utils LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt index c270c144cb..25a77d3f4f 100644 --- a/gnucash/html/CMakeLists.txt +++ b/gnucash/html/CMakeLists.txt @@ -53,6 +53,10 @@ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-html PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-html LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt index bfc14b5985..6e620ae0f2 100644 --- a/gnucash/import-export/CMakeLists.txt +++ b/gnucash/import-export/CMakeLists.txt @@ -64,6 +64,10 @@ TARGET_COMPILE_DEFINITIONS (gncmod-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.i TARGET_INCLUDE_DIRECTORIES(gncmod-generic-import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-generic-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-generic-import LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt index 44c1bdfb4a..52c2ff590f 100644 --- a/gnucash/import-export/aqb/CMakeLists.txt +++ b/gnucash/import-export/aqb/CMakeLists.txt @@ -69,6 +69,10 @@ IF(WITH_AQBANKING) ${GWENHYWFAR_INCLUDE_DIRS} ${KTOBLZCHECK_INCLUDE_DIRS}) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-aqbanking PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-aqbanking LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt index ec5efebc25..ad6cf6c479 100644 --- a/gnucash/import-export/bi-import/CMakeLists.txt +++ b/gnucash/import-export/bi-import/CMakeLists.txt @@ -39,6 +39,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-bi-import TARGET_COMPILE_DEFINITIONS(gncmod-bi-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\") +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-bi-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-bi-import LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt index 392a8fb905..424efcf7c6 100644 --- a/gnucash/import-export/csv-exp/CMakeLists.txt +++ b/gnucash/import-export/csv-exp/CMakeLists.txt @@ -25,6 +25,10 @@ TARGET_LINK_LIBRARIES(gncmod-csv-export gncmod-register-gnome gncmod-register-co TARGET_COMPILE_DEFINITIONS(gncmod-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\") +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-csv-export PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-csv-export LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt index a8a719cb72..e2fbb5ed07 100644 --- a/gnucash/import-export/csv-imp/CMakeLists.txt +++ b/gnucash/import-export/csv-imp/CMakeLists.txt @@ -72,6 +72,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-csv-import PRIVATE ${CMAKE_SOURCE_DIR}/borrowed/goffice ) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-csv-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-csv-import LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt index 014c641b06..f7e8255d9f 100644 --- a/gnucash/import-export/customer-import/CMakeLists.txt +++ b/gnucash/import-export/customer-import/CMakeLists.txt @@ -30,6 +30,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-customer-import TARGET_COMPILE_DEFINITIONS(gncmod-customer-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.customer-import\") +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-customer-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-customer-import LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt index b7ad96d974..a0878b4eec 100644 --- a/gnucash/import-export/log-replay/CMakeLists.txt +++ b/gnucash/import-export/log-replay/CMakeLists.txt @@ -20,6 +20,10 @@ TARGET_LINK_LIBRARIES(gncmod-log-replay gncmod-gnome-utils gncmod-app-utils gncm TARGET_COMPILE_DEFINITIONS(gncmod-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\") +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-log-replay PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-log-replay LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt index 7a88499d5e..5484412cd5 100644 --- a/gnucash/import-export/ofx/CMakeLists.txt +++ b/gnucash/import-export/ofx/CMakeLists.txt @@ -29,6 +29,10 @@ IF (WITH_OFX) TARGET_INCLUDE_DIRECTORIES(gncmod-ofx PRIVATE ${LIBOFX_INCLUDE_DIRS}) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-ofx PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-ofx LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt index a26fb08d49..8334451622 100644 --- a/gnucash/import-export/qif-imp/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/CMakeLists.txt @@ -25,6 +25,10 @@ TARGET_LINK_LIBRARIES(gncmod-qif-import gncmod-app-utils gncmod-gnome-utils gnc- TARGET_COMPILE_DEFINITIONS(gncmod-qif-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif.import\") +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-qif-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-qif-import LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/import-export/qif/CMakeLists.txt b/gnucash/import-export/qif/CMakeLists.txt index 7a2047a7c3..ae0fa026a6 100644 --- a/gnucash/import-export/qif/CMakeLists.txt +++ b/gnucash/import-export/qif/CMakeLists.txt @@ -29,6 +29,10 @@ TARGET_LINK_LIBRARIES(gncmod-qif gncmod-generic-import gncmod-engine ${GLIB2_LDF TARGET_COMPILE_DEFINITIONS(gncmod-qif PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif\") +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-qif PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-qif LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/register/ledger-core/CMakeLists.txt b/gnucash/register/ledger-core/CMakeLists.txt index df8a676bff..6a663bb342 100644 --- a/gnucash/register/ledger-core/CMakeLists.txt +++ b/gnucash/register/ledger-core/CMakeLists.txt @@ -53,6 +53,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-ledger-core ${CMAKE_BINARY_DIR}/gnucash/gnome-utils # for gnc-warnings.h ) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-ledger-core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-ledger-core LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/register/register-core/CMakeLists.txt b/gnucash/register/register-core/CMakeLists.txt index 6ab939f4aa..a001646115 100644 --- a/gnucash/register/register-core/CMakeLists.txt +++ b/gnucash/register/register-core/CMakeLists.txt @@ -51,6 +51,10 @@ TARGET_COMPILE_DEFINITIONS (gncmod-register-core PRIVATE -DG_LOG_DOMAIN=\"gnc.re TARGET_INCLUDE_DIRECTORIES(gncmod-register-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-register-core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-register-core LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/register/register-gnome/CMakeLists.txt b/gnucash/register/register-gnome/CMakeLists.txt index a3c17bb755..2fa125a354 100644 --- a/gnucash/register/register-gnome/CMakeLists.txt +++ b/gnucash/register/register-gnome/CMakeLists.txt @@ -53,6 +53,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-register-gnome PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/register/ledger-core ${GTK3_INCLUDE_DIRS} ) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-register-gnome PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-register-gnome LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt index 41da7bdb89..6793bb5da1 100644 --- a/gnucash/report/locale-specific/us/CMakeLists.txt +++ b/gnucash/report/locale-specific/us/CMakeLists.txt @@ -12,6 +12,10 @@ TARGET_LINK_LIBRARIES(gncmod-locale-reports-us gnc-module gncmod-app-utils gncmo TARGET_COMPILE_DEFINITIONS(gncmod-locale-reports-us PRIVATE -DG_LOG_DOMAIN=\"gnc.report.locale.us\") +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-locale-reports-us PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-locale-reports-us LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt index 3df3aa9b4a..ab4bc9a371 100644 --- a/gnucash/report/report-gnome/CMakeLists.txt +++ b/gnucash/report/report-gnome/CMakeLists.txt @@ -36,6 +36,10 @@ TARGET_COMPILE_DEFINITIONS (gncmod-report-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.rep TARGET_INCLUDE_DIRECTORIES(gncmod-report-gnome PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-report-gnome PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-report-gnome LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt index c6eec39b66..6f0bbefe7f 100644 --- a/gnucash/report/report-system/CMakeLists.txt +++ b/gnucash/report/report-system/CMakeLists.txt @@ -32,6 +32,10 @@ TARGET_INCLUDE_DIRECTORIES (gncmod-report-system ) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-report-system PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-report-system LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt index bd0e89bbe3..0964272373 100644 --- a/gnucash/report/stylesheets/CMakeLists.txt +++ b/gnucash/report/stylesheets/CMakeLists.txt @@ -22,6 +22,10 @@ IF (WIN32) ENDIF(WIN32) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-stylesheets PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-stylesheets LIBRARY DESTINATION ${LIB_DIR} ARCHIVE DESTINATION ${LIB_DIR} diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt index 795ccea9a8..3b2a312608 100644 --- a/libgnucash/app-utils/CMakeLists.txt +++ b/libgnucash/app-utils/CMakeLists.txt @@ -99,6 +99,10 @@ TARGET_INCLUDE_DIRECTORIES (gncmod-app-utils ) TARGET_COMPILE_DEFINITIONS (gncmod-app-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.app-utils\") +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-app-utils PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-app-utils LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash @@ -116,6 +120,10 @@ IF (WITH_PYTHON) ) TARGET_COMPILE_DEFINITIONS (gncmod-app-utils-python PRIVATE -DG_LOG_DOMAIN=\"gnc.app-utils\") + IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-app-utils-python PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") + ENDIF() + INSTALL(TARGETS gncmod-app-utils-python LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/libgnucash/backend/dbi/CMakeLists.txt b/libgnucash/backend/dbi/CMakeLists.txt index bedd23fa9a..6c8dbdf4ec 100644 --- a/libgnucash/backend/dbi/CMakeLists.txt +++ b/libgnucash/backend/dbi/CMakeLists.txt @@ -40,6 +40,10 @@ TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backe TARGET_INCLUDE_DIRECTORIES(gncmod-backend-dbi PRIVATE ${LIBDBI_INCLUDE_PATH}) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-backend-dbi PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-backend-dbi LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/libgnucash/backend/xml/CMakeLists.txt b/libgnucash/backend/xml/CMakeLists.txt index aafc4cda84..4c3d8c9199 100644 --- a/libgnucash/backend/xml/CMakeLists.txt +++ b/libgnucash/backend/xml/CMakeLists.txt @@ -115,6 +115,10 @@ IF (WIN32) ENDIF(WIN32) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-backend-xml PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") +ENDIF() + INSTALL(TARGETS gncmod-backend-xml LIBRARY DESTINATION ${LIB_DIR} ARCHIVE DESTINATION ${LIB_DIR} diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt index a3cd35bd17..1b2f62602c 100644 --- a/libgnucash/engine/CMakeLists.txt +++ b/libgnucash/engine/CMakeLists.txt @@ -248,6 +248,10 @@ TARGET_INCLUDE_DIRECTORIES (gncmod-engine ${CMAKE_SOURCE_DIR}/borrowed/libc # for strptime.h ) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-engine PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-engine LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash diff --git a/libgnucash/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt index 62aac51a4a..c99f1b8ff5 100644 --- a/libgnucash/tax/us/CMakeLists.txt +++ b/libgnucash/tax/us/CMakeLists.txt @@ -11,6 +11,10 @@ TARGET_LINK_LIBRARIES(gncmod-tax-us gnc-module ${GLIB2_LDFLAGS} ${GUILE_LDFLAGS} TARGET_INCLUDE_DIRECTORIES(gncmod-tax-us PRIVATE ${CMAKE_BINARY_DIR}/common ${GUILE_INCLUDE_DIRS}) +IF (APPLE) + SET_TARGET_PROPERTIES (gncmod-tax-us PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/gnucash") +ENDIF() + INSTALL(TARGETS gncmod-tax-us LIBRARY DESTINATION lib/gnucash ARCHIVE DESTINATION lib/gnucash