Skip to content

Commit

Permalink
remove lock target from makefile
Browse files Browse the repository at this point in the history
fix quoting problem with doc target
  • Loading branch information
ClausKlein committed Mar 4, 2021
1 parent 4003c3f commit 3d00624
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export CPM_SOURCE_CACHE=${HOME}/.cache/CPM
PROJECT_NAME:=$(shell basename $(CURDIR))
BUILD_DIR?=../build-$(PROJECT_NAME)-$(CXX)-$(BUILD_TYPE)

.PHONY: update format all test standalone doc check clean distclean lock
.PHONY: update format all test standalone doc check clean distclean

# the default target does just all, but neither standalone nor doc
test:
Expand All @@ -31,13 +31,6 @@ update:
wget -q -O cmake/CPM.cmake https://github.com/cpm-cmake/CPM.cmake/releases/latest/download/get_cpm.cmake
wget -q -O cmake/WarningsAsErrors.cmake https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/master/CMake/WarningsAsErrors.cmake

lock: all standalone doc
cmake --build $(BUILD_DIR)/all --target cpm-update-package-lock
cmake --build $(BUILD_DIR)/test --target cpm-update-package-lock
cmake --build $(BUILD_DIR)/install --target cpm-update-package-lock
cmake --build $(BUILD_DIR)/standalone --target cpm-update-package-lock
cmake --build $(BUILD_DIR)/documentation --target cpm-update-package-lock

# install the library to stagedir
install:
cmake -S . -B $(BUILD_DIR)/$@ ${CMAKE_PRESET} -DCMAKE_INSTALL_PREFIX=$(STAGE_DIR) -DCMAKE_CXX_STANDARD=20 #NO! -DCMAKE_CXX_CLANG_TIDY=clang-tidy # --trace-expand
Expand All @@ -61,7 +54,7 @@ all:

# GenerateDocs
doc:
cmake -S documentation -B $(BUILD_DIR)/documentation "${CMAKE_PRESET}"
cmake -S documentation -B $(BUILD_DIR)/documentation ${CMAKE_PRESET}
cmake --build $(BUILD_DIR)/documentation --target GenerateDocs

format: distclean
Expand Down

0 comments on commit 3d00624

Please sign in to comment.