From 8aa696223bc01b908db31a910ab1c454a65bbdf8 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 8 Jun 2019 16:18:08 +0200 Subject: [PATCH] Always add share/scm to GUILE_LOAD_PATH Any scm file that will be built may need access to other scheme files that may have been linked into that directory. As it was only scm files that would be linked themselves would also be built with the search path set, causing other linked files not to be found for an scm file that doesn't add a link for itself. --- common/cmake_modules/GncAddSchemeTargets.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake index c7228c1bac..25adc8aa3d 100644 --- a/common/cmake_modules/GncAddSchemeTargets.cmake +++ b/common/cmake_modules/GncAddSchemeTargets.cmake @@ -90,9 +90,7 @@ function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS list(APPEND _GUILE_LOAD_COMPILED_PATH ${guile_load_compiled_path}) endif() set(_GUILE_CACHE_DIR ${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}) - if (MAKE_LINKS) - list(APPEND _GUILE_LOAD_PATH "${build_datadir}/gnucash/scm") - endif() + list(APPEND _GUILE_LOAD_PATH "${build_datadir}/gnucash/scm") list(APPEND _GUILE_LOAD_COMPILED_PATH ${build_libdir}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}) set(_TARGET_FILES "")