kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-25 07:24:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1609 from elevatormind/refactor/tbt-relative-path-macro

Browse Source 
Give the common title blocks path its own RELATIVE_TO_BINARY_PATH macro
This commit is contained in:
ispyisail
2026-10-25 18:30:09 +13:00
committed by GitHub
parent 0020e0cd13 d49ebe8b56
commit af493af85c
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/define_definitions.cmake
+6
View File
@@ -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()
sources/qetapp.cpp
+5 -1
View File
@@ -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)));