Merge pull request #837 from asuessenbach/AppVeyor

Add MSVC 2019 builds again
This commit is contained in:
Andreas Süßenbach 2020-12-07 17:24:09 +01:00 committed by GitHub
commit 3d16e6ea20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 16 deletions

View File

@ -23,7 +23,37 @@ environment:
GENERATOR_ARCH: x64 GENERATOR_ARCH: x64
PYTHON: "C:\\Python38-x64" PYTHON: "C:\\Python38-x64"
CXX_STANDARD: 11 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: install:
- git submodule update --init --recursive - git submodule update --init --recursive
- set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%

View File

@ -12,24 +12,26 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 set(SOURCES
PhysicalDeviceMemoryProperties.cpp PhysicalDeviceMemoryProperties.cpp
) )
source_group(headers FILES ${HEADERS}) source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES}) source_group(sources FILES ${SOURCES})
add_executable(PhysicalDeviceMemoryProperties add_executable(PhysicalDeviceMemoryProperties
${HEADERS} ${HEADERS}
${SOURCES} ${SOURCES}
) )
set_target_properties(PhysicalDeviceMemoryProperties PROPERTIES FOLDER "Samples") set_target_properties(PhysicalDeviceMemoryProperties PROPERTIES FOLDER "Samples")
target_link_libraries(PhysicalDeviceMemoryProperties PRIVATE utils) target_link_libraries(PhysicalDeviceMemoryProperties PRIVATE utils)
endif(!MSVC)