From 3d006248f5e41729198d7657e791edf787a436b7 Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Thu, 4 Mar 2021 20:38:34 +0100 Subject: [PATCH] remove lock target from makefile fix quoting problem with doc target --- GNUmakefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index e7c35e9..789bd68 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -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: @@ -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 @@ -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