diff options
| author | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2022-10-22 11:57:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 11:57:36 +0100 |
| commit | 3a27ef5e12f0336b0a4bfce0ba98be45f0f5ef51 (patch) | |
| tree | 716bbf508f0a6fa11df89f25281fa9e373456b0d | |
| parent | b71d7c9007d77f78a403075b99adf8e9d43bf125 (diff) | |
| parent | 6d273c8e44cadb58531dbeeb705eaecdab0d3fc9 (diff) | |
Merge pull request #893 from wael444/main
meson.build,CMakeLists.txt: use sh instead of bash
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 06aabd2c..da311fde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,13 +22,13 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process( - COMMAND bash -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1" + COMMAND sh -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMIT_MESSAGE OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process( - COMMAND bash -c "git diff-index --quiet HEAD -- || echo \"dirty\"" + COMMAND sh -c "git diff-index --quiet HEAD -- || echo \"dirty\"" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_DIRTY OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -93,4 +93,4 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -no-pie -fno-builtin") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg -no-pie -fno-builtin") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg -no-pie -fno-builtin") -ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
\ No newline at end of file +ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) diff --git a/meson.build b/meson.build index c9900ec1..498fa765 100644 --- a/meson.build +++ b/meson.build @@ -20,8 +20,8 @@ endif GIT_BRANCH = run_command('git', 'rev-parse', '--abbrev-ref', 'HEAD', check: false).stdout().strip() GIT_COMMIT_HASH = run_command('git', 'rev-parse', 'HEAD', check: false).stdout().strip() -GIT_COMMIT_MESSAGE = run_command('bash', '-c', 'git show | head -n 5 | tail -n 1', check: false).stdout().strip() -GIT_DIRTY = run_command('bash', '-c', 'git diff-index --quiet HEAD -- || echo "dirty"', check: false).stdout().strip() +GIT_COMMIT_MESSAGE = run_command('sh', '-c', 'git show | head -n 5 | tail -n 1', check: false).stdout().strip() +GIT_DIRTY = run_command('sh', '-c', 'git diff-index --quiet HEAD -- || echo "dirty"', check: false).stdout().strip() add_project_arguments( [ |