gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Mar 7 19:15:32 EST 2023
Updated via https://github.com/Gnucash/gnucash/commit/2872d86c (commit)
via https://github.com/Gnucash/gnucash/commit/3a7464a3 (commit)
from https://github.com/Gnucash/gnucash/commit/4d37cf5c (commit)
commit 2872d86ca5e450797ee3fc1029fbcc1a7ed664dc
Merge: 4d37cf5ca5 3a7464a312
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 7 16:07:17 2023 -0800
Merge Richard Cohen's 'remove-redundant-cmake-env' into master.
commit 3a7464a3125631d26ebb52ee384a34873cd719ff
Author: Richard Cohen <richard at daijobu.co.uk>
Date: Sun Feb 26 16:26:48 2023 +0000
Remove redundant uses of cmake -E env
- In GncAddTest, set_tests_properties() is already setting the env
- In the other uses, there is no change to the environment
diff --git a/common/cmake_modules/GncAddGSchemaTargets.cmake b/common/cmake_modules/GncAddGSchemaTargets.cmake
index 83a26d8a5c..a4b014f6f1 100644
--- a/common/cmake_modules/GncAddGSchemaTargets.cmake
+++ b/common/cmake_modules/GncAddGSchemaTargets.cmake
@@ -12,8 +12,7 @@ macro(add_gschema_targets _gschema_INPUTS)
list(APPEND _gschema_VALIDS ${_VALID_FILE})
add_custom_command(
OUTPUT ${_VALID_FILE}
- COMMAND ${CMAKE_COMMAND} -E env
- ${GLIB_COMPILE_SCHEMAS} --strict --dry-run --schema-file=${_OUTPUT_FILE}
+ COMMAND ${GLIB_COMPILE_SCHEMAS} --strict --dry-run --schema-file=${_OUTPUT_FILE}
COMMAND ${CMAKE_COMMAND} -E touch ${_VALID_FILE}
DEPENDS ${_OUTPUT_FILE}
)
diff --git a/common/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake
index 0bd7183cd7..6d095afc4b 100644
--- a/common/cmake_modules/GncAddTest.cmake
+++ b/common/cmake_modules/GncAddTest.cmake
@@ -84,9 +84,7 @@ function(gnc_add_test _TARGET _SOURCE_FILES TEST_INCLUDE_VAR_NAME TEST_LIBS_VAR_
target_link_libraries(${_TARGET} ${TEST_LIBS})
target_include_directories(${_TARGET} PRIVATE ${TEST_INCLUDE_DIRS})
if (${HAVE_ENV_VARS})
- add_test(${_TARGET} ${CMAKE_COMMAND} -E env "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR};${ARGN}"
- ${CMAKE_BINARY_DIR}/bin/${_TARGET}
- )
+ add_test(${_TARGET} ${CMAKE_BINARY_DIR}/bin/${_TARGET})
set_tests_properties(${_TARGET} PROPERTIES ENVIRONMENT "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR};${ARGN}")
else()
if (CMAKE_GENERATOR STREQUAL Xcode)
@@ -108,8 +106,7 @@ endfunction()
function(gnc_add_scheme_test _TARGET _SOURCE_FILE)
- add_test(${_TARGET} ${CMAKE_COMMAND} -E env
- ${GUILE_EXECUTABLE} --debug -c "
+ add_test(${_TARGET} ${GUILE_EXECUTABLE} --debug -c "
(set! %load-hook
(lambda (filename)
(when (and filename
diff --git a/common/cmake_modules/MakeDist.cmake b/common/cmake_modules/MakeDist.cmake
index da04beddf8..eea65f05c3 100644
--- a/common/cmake_modules/MakeDist.cmake
+++ b/common/cmake_modules/MakeDist.cmake
@@ -63,7 +63,7 @@ function(make_dist PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_F
COMMAND ${CMAKE_COMMAND} -E copy ${PACKAGE_PREFIX}.tar ${PACKAGE_PREFIX}.tar.save
)
execute_process_and_check_result(
- COMMAND ${CMAKE_COMMAND} -E env gzip -f ${PACKAGE_PREFIX}.tar
+ COMMAND gzip -f ${PACKAGE_PREFIX}.tar
WORKING_DIRECTORY .
ERROR_MSG "gzip command to create ${PACKAGE_PREFIX}.tar.gz failed."
)
@@ -73,7 +73,7 @@ function(make_dist PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_F
COMMAND ${CMAKE_COMMAND} -E rename ${PACKAGE_PREFIX}.tar.save ${PACKAGE_PREFIX}.tar
)
execute_process_and_check_result(
- COMMAND ${CMAKE_COMMAND} -E env bzip2 -f ${PACKAGE_PREFIX}.tar
+ COMMAND bzip2 -f ${PACKAGE_PREFIX}.tar
WORKING_DIRECTORY .
ERROR_MSG "bzip2 command to create ${PACKAGE_PREFIX}.tar.bz2 failed."
)
diff --git a/common/cmake_modules/MakeDistCheck.cmake b/common/cmake_modules/MakeDistCheck.cmake
index a5dd322d2c..4caba9179c 100644
--- a/common/cmake_modules/MakeDistCheck.cmake
+++ b/common/cmake_modules/MakeDistCheck.cmake
@@ -54,28 +54,28 @@ function(run_dist_check PACKAGE_PREFIX EXT)
# Run ninja in the build directory
execute_process_and_check_result(
- COMMAND ${CMAKE_COMMAND} -E env ${NINJA_COMMAND}
+ COMMAND ${NINJA_COMMAND}
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "Ninja build failed."
)
# Run ninja install
execute_process_and_check_result(
- COMMAND ${CMAKE_COMMAND} -E env ${NINJA_COMMAND} install
+ COMMAND ${NINJA_COMMAND} install
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "Ninja install failed."
)
# Run ninja check in the build directory
execute_process_and_check_result(
- COMMAND ${CMAKE_COMMAND} -E env ${NINJA_COMMAND} check
+ COMMAND ${NINJA_COMMAND} check
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "Ninja check failed."
)
# Run ninja dist
execute_process_and_check_result(
- COMMAND ${CMAKE_COMMAND} -E env ${NINJA_COMMAND} dist
+ COMMAND ${NINJA_COMMAND} dist
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "Ninja dist failed."
)
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 32e9a151a7..e0c7dc9320 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -180,8 +180,7 @@ if (NOT BUILDING_FROM_VCS)
else()
add_custom_command (
OUTPUT ${GNC_APPDATA_IN}
- COMMAND ${CMAKE_COMMAND} -E env
- ${GETTEXT_MSGFMT_EXECUTABLE}
+ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
--xml --template ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in.in
-d ${CMAKE_SOURCE_DIR}/po
-o ${GNC_APPDATA_IN}
diff --git a/gnucash/gschemas/CMakeLists.txt b/gnucash/gschemas/CMakeLists.txt
index 2fd46cba01..26cc6a890e 100644
--- a/gnucash/gschemas/CMakeLists.txt
+++ b/gnucash/gschemas/CMakeLists.txt
@@ -44,7 +44,7 @@ if (COMPILE_GSCHEMAS)
add_custom_command(
OUTPUT ${SCHEMADIR_BUILD}/gschemas.compiled
- COMMAND ${CMAKE_COMMAND} -E env ${GLIB_COMPILE_SCHEMAS} --strict ${SCHEMADIR_BUILD}
+ COMMAND ${GLIB_COMPILE_SCHEMAS} --strict ${SCHEMADIR_BUILD}
DEPENDS ${gschema_depends}
)
diff --git a/libgnucash/backend/xml/test/CMakeLists.txt b/libgnucash/backend/xml/test/CMakeLists.txt
index 1838a53d93..125fdf1dba 100644
--- a/libgnucash/backend/xml/test/CMakeLists.txt
+++ b/libgnucash/backend/xml/test/CMakeLists.txt
@@ -94,8 +94,7 @@ set(test-real-data-env
TEST_PATH=${CMAKE_BINARY_DIR}/bin
)
add_test(NAME test-real-data
- COMMAND ${CMAKE_COMMAND} -E env
- ${SHELL} ${CMAKE_CURRENT_SOURCE_DIR}/test-real-data.sh
+ COMMAND ${SHELL} ${CMAKE_CURRENT_SOURCE_DIR}/test-real-data.sh
CONFIGURATIONS Debug;Release
)
set_tests_properties(test-real-data PROPERTIES ENVIRONMENT "${test-real-data-env}")
diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt
index 331538efcc..7e42016629 100644
--- a/libgnucash/quotes/CMakeLists.txt
+++ b/libgnucash/quotes/CMakeLists.txt
@@ -15,7 +15,7 @@ foreach(file finance-quote-wrapper)
list(APPEND _MAN_FILES ${_MAN_OUTPUT})
add_custom_command(
OUTPUT ${_MAN_OUTPUT}
- COMMAND ${CMAKE_COMMAND} -E env ${PERL_EXECUTABLE} ${POD2MAN_EXECUTABLE} ${_POD_INPUT} ${_MAN_OUTPUT}
+ COMMAND ${PERL_EXECUTABLE} ${POD2MAN_EXECUTABLE} ${_POD_INPUT} ${_MAN_OUTPUT}
DEPENDS ${_POD_INPUT}
)
endforeach(file)
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 7f76968787..6d88231d29 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -19,8 +19,7 @@ foreach (lingua ${ALL_LINGUAS})
add_custom_command(
OUTPUT ${_MO_FILE}
- COMMAND ${CMAKE_COMMAND} -E env
- ${GETTEXT_MSGFMT_EXECUTABLE}
+ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
-o ${_MO_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${lingua}.po
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${lingua}.po
)
Summary of changes:
common/cmake_modules/GncAddGSchemaTargets.cmake | 3 +--
common/cmake_modules/GncAddTest.cmake | 7 ++-----
common/cmake_modules/MakeDist.cmake | 4 ++--
common/cmake_modules/MakeDistCheck.cmake | 8 ++++----
gnucash/gnome/CMakeLists.txt | 3 +--
gnucash/gschemas/CMakeLists.txt | 2 +-
libgnucash/backend/xml/test/CMakeLists.txt | 3 +--
libgnucash/quotes/CMakeLists.txt | 2 +-
po/CMakeLists.txt | 3 +--
9 files changed, 14 insertions(+), 21 deletions(-)
More information about the gnucash-changes
mailing list