gnucash stable: Enforce searching for our gsettings schema files first where they were installed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/0aa46ff1 (commit)
	from  https://github.com/Gnucash/gnucash/commit/750a50dd (commit)



commit 0aa46ff131f8a4e2ba1003261d68deee576e0407
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Dec 13 20:26:31 2024 +0100

    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.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 7bc6fa91e1..28e7d7d472 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -209,10 +209,9 @@ set(XDG_TEXT "
 # and gsettings schema are found.\n"
 )
 
-if (NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/share") AND NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/local/share"))
-  file(APPEND ${ENV_FILE_OUT} ${XDG_TEXT})
-  file(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
-endif()
+file(APPEND ${ENV_FILE_OUT} ${XDG_TEXT})
+file(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
+
 file(APPEND ${BUILD_ENV_FILE_OUT} ${XDG_TEXT})
 file(APPEND ${BUILD_ENV_FILE_OUT} "XDG_DATA_DIRS=${DATADIR_BUILD};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
 



Summary of changes:
 gnucash/CMakeLists.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)