Skip to content

Commit 1b45f87

Browse files
committed
Fix make compile
1 parent c57d250 commit 1b45f87

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,17 @@ $(_build_path)/CMakeCache.txt: | $(_build_path) .gitmodules
6060
ln -s $(_build_path)/compile_commands.json
6161

6262
compile: $(_build_path)/CMakeCache.txt ## Compile the project
63+
cmake $(CMAKE_FLAGS) -DCMAKE_TOOLCHAIN_FILE=etc/$(TOOLCHAIN)-toolchain.cmake -B $(_build_path) -S .
6364
cmake --build $(_build_path) --config $(CONFIG) --target all -- -k 0
6465

6566
install: $(_build_path)/CMakeCache.txt ## Install the project
6667
DESTDIR=$(abspath $(DEST)) ninja -C $(_build_path) -k 0 install
6768

6869
ctest: $(_build_path)/CMakeCache.txt ## Run CTest on current build
69-
cd $(_build_path) && ctest --output-on-failure
70+
ctest --build-config $(CONFIG) --output-on-failure --test-dir $(_build_path)
7071

7172
ctest_ : compile
72-
cd $(_build_path) && ctest --output-on-failure
73+
ctest --build-config $(CONFIG) --output-on-failure --test-dir $(_build_path)
7374

7475
test: ctest_ ## Rebuild and run tests
7576

0 commit comments

Comments
 (0)