mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Merge branch 'maint'
Resolves most merge conflicts. The only bit I was unable to merge from maint into master is the use of match-lambda in category-barchart.scm. This will have to be redone manually.
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
|
||||
set(cmake_FILES GncAddGSchemaTargets.cmake GncAddSchemeTargets.cmake GncAddSwigCommand.cmake GncAddTest.cmake
|
||||
MacroAddSourceFileCompileFlags.cmake MacroAppendForeach.cmake
|
||||
MakeDist.cmake MakeDistFiles.cmake MakeDistCheck.cmake)
|
||||
set(cmake_FILES
|
||||
GncAddGSchemaTargets.cmake GncAddSchemeTargets.cmake
|
||||
GncAddSwigCommand.cmake GncAddTest.cmake GncPkgConfig.cmake
|
||||
MacroAddSourceFileCompileFlags.cmake MacroAppendForeach.cmake
|
||||
MakeDist.cmake MakeDistFiles.cmake MakeDistCheck.cmake
|
||||
)
|
||||
|
||||
set_dist_list(cmake_modules_DIST CMakeLists.txt COPYING-CMAKE-SCRIPTS.txt ${cmake_FILES})
|
||||
|
||||
Reference in New Issue
Block a user