From d49ebe8b56b3cebe29a824f419aefb230293411c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Hellstr=C3=B6mer?= Date: Sat, 24 Oct 2026 13:06:03 +0200 Subject: [PATCH] Give the common title blocks path its own RELATIVE_TO_BINARY_PATH macro The common title blocks folder was taken as relative to the executable only when QET_COMMON_COLLECTION_PATH_RELATIVE_TO_BINARY_PATH was defined, the macro of the elements folder. Add QET_COMMON_TBT_PATH_RELATIVE_TO_BINARY_PATH for it; the collection macro still applies too, so a build that defines it is unchanged. CMake now passes QET_COMMON_COLLECTION_PATH_RELATIVE_TO_BINARY_PATH and QET_COMMON_TBT_PATH_RELATIVE_TO_BINARY_PATH on when the variables of the same names are set, as it already did for the lang folder. Nothing sets them, so the default build is unchanged. Co-Authored-By: Claude Opus 5.5 --- cmake/define_definitions.cmake | 6 ++++++ sources/qetapp.cpp | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cmake/define_definitions.cmake b/cmake/define_definitions.cmake index 40b3bb904..d8c9dd529 100644 --- a/cmake/define_definitions.cmake +++ b/cmake/define_definitions.cmake @@ -28,10 +28,16 @@ if(${QET_COMMON_COLLECTION_PATH} STRGREATER "") message("QET_COMMON_COLLECTION_PATH " ${COMPIL_PREFIX}${QET_COMMON_COLLECTION_PATH}) add_definitions(-DQET_COMMON_COLLECTION_PATH=${COMPIL_PREFIX}${QET_COMMON_COLLECTION_PATH}) endif() +if(${QET_COMMON_COLLECTION_PATH_RELATIVE_TO_BINARY_PATH}) + add_definitions(-DQET_COMMON_COLLECTION_PATH_RELATIVE_TO_BINARY_PATH) +endif() if(${QET_COMMON_TBT_PATH} STRGREATER "") message("QET_COMMON_TBT_PATH " ${COMPIL_PREFIX}${QET_COMMON_TBT_PATH}) add_definitions(-DQET_COMMON_TBT_PATH=${COMPIL_PREFIX}${QET_COMMON_TBT_PATH}) endif() +if(${QET_COMMON_TBT_PATH_RELATIVE_TO_BINARY_PATH}) + add_definitions(-DQET_COMMON_TBT_PATH_RELATIVE_TO_BINARY_PATH) +endif() if(${QET_LANG_PATH_RELATIVE_TO_BINARY_PATH}) add_definitions(-DQET_LANG_PATH_RELATIVE_TO_BINARY_PATH) endif() diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 286166da6..a6f5b4405 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -871,7 +871,11 @@ QString QETApp::commonTitleBlockTemplatesDir() */ return(QCoreApplication::applicationDirPath() + "/titleblocks/"); #else - #ifndef QET_COMMON_COLLECTION_PATH_RELATIVE_TO_BINARY_PATH + /* QET_COMMON_COLLECTION_PATH_RELATIVE_TO_BINARY_PATH used to decide + * this path too, so it still does + */ + #if !defined(QET_COMMON_TBT_PATH_RELATIVE_TO_BINARY_PATH) \ + && !defined(QET_COMMON_COLLECTION_PATH_RELATIVE_TO_BINARY_PATH) // the compile-time option represents a usual path // (be it absolute or relative) return(resolveConfiguredDataPath(QUOTE(QET_COMMON_TBT_PATH)));