[buildcore] Cleanup
This commit is contained in:
@@ -32,7 +32,7 @@ ifdef USE_VCPKG
|
|||||||
ifndef VCPKG_VERSION
|
ifndef VCPKG_VERSION
|
||||||
VCPKG_VERSION=2020.06
|
VCPKG_VERSION=2020.06
|
||||||
endif
|
endif
|
||||||
VCPKG_TOOLCHAIN=--toolchain=${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
|
VCPKG_TOOLCHAIN=--toolchain=${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS),darwin)
|
ifeq ($(OS),darwin)
|
||||||
DEBUGGER=lldb
|
DEBUGGER=lldb
|
||||||
@@ -116,7 +116,7 @@ else # USE_VCPKG
|
|||||||
|
|
||||||
.PHONY: setup-conan
|
.PHONY: setup-conan
|
||||||
conan-config:
|
conan-config:
|
||||||
conan profile new nostalgia --detect --force
|
conan profile new nostalgia --detect --force
|
||||||
ifeq ($(OS),linux)
|
ifeq ($(OS),linux)
|
||||||
conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
|
conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user