Skip to content

Commit 53f9968

Browse files
committed
Build in build/ rather than cmake_build/
1 parent f52468b commit 53f9968

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/c.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
timeout-minutes: 1
4949
- uses: actions/upload-artifact@v2
5050
with:
51-
path: cmake_build/
51+
path: build/
5252
name: builddir-${{ matrix.os }}
5353
- name: make check
5454
run: unbuffer make check

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.texe
33
*.o
44
*.d
5+
build/

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ ifeq ($(filter $(DROP_TARGETS),$(MAKECMDGOALS)),)
160160
endif
161161

162162
all:
163-
cmake -S . -B cmake_build -DJIT=${JIT} -DSDL=${SDL} -DICARUS=${ICARUS}
164-
cmake --build cmake_build
163+
cmake -S . -B build -DJIT=${JIT} -DSDL=${SDL} -DICARUS=${ICARUS}
164+
cmake --build build
165165

166166
check: all icarus
167-
cmake -S . -B cmake_build -DJIT=${JIT} -DSDL=${SDL} -DICARUS=${ICARUS} -DTESTING=1
168-
cmake --build cmake_build
169-
export PATH=$(abspath .):$$PATH && cd cmake_build && ctest --rerun-failed --output-on-failure
167+
cmake -S . -B build -DJIT=${JIT} -DSDL=${SDL} -DICARUS=${ICARUS} -DTESTING=1
168+
cmake --build build
169+
export PATH=$(abspath .):$$PATH && cd build && ctest --rerun-failed --output-on-failure
170170

171171
ifneq ($(ICARUS),0)
172172
%.vpi: INCLUDES += src

0 commit comments

Comments
 (0)