From 0800990456dd3e871f778230ceeeb2857f38f8da Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Mon, 7 Dec 2020 16:22:07 +0100 Subject: [PATCH] Add MSVC 2019 builds again + remove breaking project samples/PhysicalDeviceMemoryProperties for MSVC --- .appveyor.yml | 32 ++++++++++++++++++- .../CMakeLists.txt | 32 ++++++++++--------- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9caa43e..3daa020 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,7 +23,37 @@ environment: GENERATOR_ARCH: x64 PYTHON: "C:\\Python38-x64" CXX_STANDARD: 11 - + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD_TYPE: Debug + GENERATOR_ARCH: Win32 + PYTHON: "C:\\Python38" + CXX_STANDARD: 11 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD_TYPE: Debug + GENERATOR_ARCH: x64 + PYTHON: "C:\\Python38-x64" + CXX_STANDARD: 11 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD_TYPE: Debug + GENERATOR_ARCH: x64 + PYTHON: "C:\\Python38-x64" + CXX_STANDARD: 14 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD_TYPE: Debug + GENERATOR_ARCH: x64 + PYTHON: "C:\\Python38-x64" + CXX_STANDARD: 17 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD_TYPE: Debug + GENERATOR_ARCH: x64 + PYTHON: "C:\\Python38-x64" + CXX_STANDARD: 20 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD_TYPE: Release + GENERATOR_ARCH: x64 + PYTHON: "C:\\Python38-x64" + CXX_STANDARD: 20 + install: - git submodule update --init --recursive - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% diff --git a/samples/PhysicalDeviceMemoryProperties/CMakeLists.txt b/samples/PhysicalDeviceMemoryProperties/CMakeLists.txt index da07df4..05494e3 100644 --- a/samples/PhysicalDeviceMemoryProperties/CMakeLists.txt +++ b/samples/PhysicalDeviceMemoryProperties/CMakeLists.txt @@ -12,24 +12,26 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.2) +if(!MSVC) + cmake_minimum_required(VERSION 3.2) -project(PhysicalDeviceMemoryProperties) + project(PhysicalDeviceMemoryProperties) -set(HEADERS -) + set(HEADERS + ) -set(SOURCES - PhysicalDeviceMemoryProperties.cpp -) + set(SOURCES + PhysicalDeviceMemoryProperties.cpp + ) -source_group(headers FILES ${HEADERS}) -source_group(sources FILES ${SOURCES}) + source_group(headers FILES ${HEADERS}) + source_group(sources FILES ${SOURCES}) -add_executable(PhysicalDeviceMemoryProperties - ${HEADERS} - ${SOURCES} -) + add_executable(PhysicalDeviceMemoryProperties + ${HEADERS} + ${SOURCES} + ) -set_target_properties(PhysicalDeviceMemoryProperties PROPERTIES FOLDER "Samples") -target_link_libraries(PhysicalDeviceMemoryProperties PRIVATE utils) + set_target_properties(PhysicalDeviceMemoryProperties PROPERTIES FOLDER "Samples") + target_link_libraries(PhysicalDeviceMemoryProperties PRIVATE utils) +endif(!MSVC)