Skip to content

Commit 0aa46ff

Browse files
committed
Enforce searching for our gsettings schema files first where they were installed
This was not done when the installation prefix was /usr or /usr/local which could potentially cause gnucash to find other schema files first.
1 parent 750a50d commit 0aa46ff

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

gnucash/CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,9 @@ set(XDG_TEXT "
209209
# and gsettings schema are found.\n"
210210
)
211211

212-
if (NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/share") AND NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/local/share"))
213-
file(APPEND ${ENV_FILE_OUT} ${XDG_TEXT})
214-
file(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
215-
endif()
212+
file(APPEND ${ENV_FILE_OUT} ${XDG_TEXT})
213+
file(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
214+
216215
file(APPEND ${BUILD_ENV_FILE_OUT} ${XDG_TEXT})
217216
file(APPEND ${BUILD_ENV_FILE_OUT} "XDG_DATA_DIRS=${DATADIR_BUILD};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
218217

0 commit comments

Comments
 (0)