mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Merge branch 'maint'
Bumping the required cmake to 3.10 and removing GncPkgConfig.cmake as no longer required.
This commit is contained in:
@@ -195,7 +195,7 @@ function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
|
||||
if (MINGW64)
|
||||
set(fpath "")
|
||||
file(TO_CMAKE_PATH "$ENV{PATH}" fpath)
|
||||
set(LIBRARY_PATH "PATH=\"${BINDIR_BUILD};${fpath}\"")
|
||||
set(LIBRARY_PATH "PATH=${BINDIR_BUILD};${fpath}")
|
||||
else (MINGW64)
|
||||
set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash")
|
||||
endif (MINGW64)
|
||||
@@ -226,13 +226,14 @@ function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
|
||||
COMMAND ${CMAKE_COMMAND} -E env
|
||||
"${LIBRARY_PATH}"
|
||||
"GNC_UNINSTALLED=YES"
|
||||
"GNC_BUILDDIR=\"${CMAKE_BINARY_DIR}\""
|
||||
"GUILE_LOAD_PATH=\"${_GUILE_LOAD_PATH}\""
|
||||
"GUILE_LOAD_COMPILED_PATH=\"${_GUILE_LOAD_COMPILED_PATH}\""
|
||||
"GNC_MODULE_PATH=\"${_GNC_MODULE_PATH}\""
|
||||
${GUILE_EXECUTABLE} -e '\(@@ \(guild\) main\)' -s ${GUILD_EXECUTABLE} compile -o ${output_file} ${source_file_abs_path}
|
||||
"GNC_BUILDDIR=${CMAKE_BINARY_DIR}"
|
||||
"GUILE_LOAD_PATH=${_GUILE_LOAD_PATH}"
|
||||
"GUILE_LOAD_COMPILED_PATH=${_GUILE_LOAD_COMPILED_PATH}"
|
||||
"GNC_MODULE_PATH=${_GNC_MODULE_PATH}"
|
||||
${GUILE_EXECUTABLE} -e "\(@@ \(guild\) main\)" -s ${GUILD_EXECUTABLE} compile -o ${output_file} ${source_file_abs_path}
|
||||
DEPENDS ${guile_depends}
|
||||
MAIN_DEPENDENCY ${source_file_abs_path}
|
||||
VERBATIM
|
||||
)
|
||||
endforeach(source_file)
|
||||
if (__DEBUG)
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
|
||||
if (${CMAKE_VERSION} VERSION_LESS 3.3)
|
||||
include(CMakeParseArguments)
|
||||
endif()
|
||||
|
||||
|
||||
function(set_local_dist output)
|
||||
set(dist_files "")
|
||||
foreach(file ${ARGN})
|
||||
|
||||
Reference in New Issue
Block a user