handle the default build dir to be relative to the source dir

This commit is contained in:
Alfi Maulana 2023-01-22 11:23:52 +07:00
parent 186353f77a
commit 584ef59aad
No known key found for this signature in database
GPG Key ID: 2242A64C2A8DF5A4
2 changed files with 15 additions and 10 deletions

View File

@ -31,13 +31,13 @@ jobs:
uses: ./
with:
source-dir: test
build-dir: test/build
build-dir: output
- name: Run the build result
run: test/build/hello_world
run: output/hello_world
- name: Check if the default build directory does not exist
run: test ! -d build
run: test ! -d build && test ! -d test/build
additional-flags-usage:
runs-on: ${{ matrix.compiler == 'msvc' && 'windows' || 'ubuntu' }}-latest
@ -59,8 +59,8 @@ jobs:
- name: Run the build results
run: |
${{ matrix.compiler == 'msvc' && 'build\Debug\test_c.exe' || 'build/test_c' }}
${{ matrix.compiler == 'msvc' && 'build\Debug\test_cpp.exe' || 'build/test_cpp' }}
${{ matrix.compiler == 'msvc' && 'test\build\Debug\test_c.exe' || 'test/build/test_c' }}
${{ matrix.compiler == 'msvc' && 'test\build\Debug\test_cpp.exe' || 'test/build/test_cpp' }}
specified-compiler-usage:
runs-on: ${{ matrix.os }}-latest
@ -82,7 +82,7 @@ jobs:
args: -D CHECK_USING_CLANG=ON
- name: Run the build results
run: build/test_c && build/test_cpp
run: test/build/test_c && test/build/test_cpp
specified-generator-usage:
runs-on: ${{ matrix.os }}-latest
@ -100,4 +100,4 @@ jobs:
generator: Ninja
- name: Run the build result
run: build/hello_world
run: test/build/hello_world

View File

@ -11,7 +11,6 @@ inputs:
build-dir:
description: Build directory of the CMake project
required: false
default: build
targets:
description: List of build targets
required: false
@ -44,8 +43,14 @@ runs:
if [ -n '${{ inputs.source-dir }}' ]; then
SOURCE_DIR="${{ inputs.source-dir }}"
fi
ARGS="'$SOURCE_DIR' -B '${{ inputs.build-dir }}'"
BUILD_ARGS="--build '${{ inputs.build-dir }}'"
BUILD_DIR="build"
if [ -n '${{ inputs.build-dir }}' ]; then
BUILD_DIR="${{ inputs.build-dir }}"
elif [ -n "${{ inputs.source-dir }}" ]; then
BUILD_DIR="${{ inputs.source-dir }}/build"
fi
ARGS="'$SOURCE_DIR' -B '$BUILD_DIR'"
BUILD_ARGS="--build '$BUILD_DIR'"
if [ -n '${{ inputs.targets }}' ]; then
BUILD_ARGS="$BUILD_ARGS --target ${{ inputs.targets }}"
fi