From 15f6f013c25804e74d90d98b57cc52e259aa62e8 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 5 Nov 2021 19:46:48 -0500
Subject: [PATCH] [buildcore] Upgrade to C++20 and fix conan setup to use
 project specific profile

---
 base.cmake | 2 +-
 base.mk    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/base.cmake b/base.cmake
index 2637125..e8dee54 100644
--- a/base.cmake
+++ b/base.cmake
@@ -11,7 +11,7 @@ set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/dist/${BUILDCORE_BUILD_CONFIG}")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 # enable ccache
diff --git a/base.mk b/base.mk
index f20d4e5..41e5aae 100644
--- a/base.mk
+++ b/base.mk
@@ -101,6 +101,7 @@ devenv-shell:
 	${ENV_RUN} bash
 
 ifdef USE_VCPKG
+
 .PHONY: vcpkg
 vcpkg: ${VCPKG_DIR} vcpkg-install
 
@@ -121,18 +122,19 @@ ifneq (${OS},windows)
 else
 	${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
 endif
-else # USE_VCPKG
+
+else # USE_VCPKG ################################################
 
 .PHONY: setup-conan
 conan-config:
-	conan profile new nostalgia --detect --force
+	conan profile new ${PROJECT_NAME} --detect --force
 ifeq ($(OS),linux)
 	conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
 endif
 .PHONY: conan
 conan:
 	@mkdir -p .conanbuild && cd .conanbuild && conan install ../ --build=missing -pr=${PROJECT_NAME}
-endif # USE_VCPKG
+endif # USE_VCPKG ###############################################
 
 .PHONY: configure-xcode
 configure-xcode: