diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2018-06-05 10:56:50 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2018-06-06 11:37:27 -0600 |
| commit | 1e33f7a742083b5e51566720b31ddd4d176b6ac7 (patch) | |
| tree | 263b64c0b0dfdc30b030a91f05580ed963b380e4 /.appveyor.yml | |
| parent | 1e7d916df477e4bbffd8dfc422245df0326d0ab3 (diff) | |
| download | vulkan-validation-layers-1e33f7a742083b5e51566720b31ddd4d176b6ac7.tar.gz | |
build: Update appveyor/travis for INSTALL_DIR builds
Removed submodule cruft, removed *_REPO_ROOT references, changed
to new install targets for loader, headers, and glslang.
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index c13076127..4c5296739 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,7 +31,6 @@ before_build: - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%" - echo. - echo Starting build for %APPVEYOR_REPO_NAME% in %APPVEYOR_BUILD_FOLDER% - - git submodule update --init --recursive # Determine the appropriate CMake generator for the current version of Visual Studio - echo Determining VS version - python .\scripts\determine_vs_version.py > vsversion.tmp @@ -54,12 +53,12 @@ before_build: # Build Vulkan-Loader - echo Building Vulkan-Loader for %PLATFORM% %CONFIGURATION% - cd %APPVEYOR_BUILD_FOLDER% - - git clone --recurse-submodules https://github.com/KhronosGroup/Vulkan-Loader.git + - git clone https://github.com/KhronosGroup/Vulkan-Loader.git - cd Vulkan-Loader - mkdir %BUILD_DIR% - cd %BUILD_DIR% - - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers/%BUILD_DIR%/install .. - - cmake --build . --config %CONFIGURATION% -- /maxcpucount + - cmake -G %GENERATOR% -DCMAKE_INSTALL_PREFIX=install -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers/%BUILD_DIR%/install .. + - cmake --build . --config %CONFIGURATION% --target install -- /maxcpucount # Build glslang - echo Building glslang for %PLATFORM% %CONFIGURATION% - cd %APPVEYOR_BUILD_FOLDER% @@ -69,7 +68,7 @@ before_build: - mkdir %BUILD_DIR% - cd %BUILD_DIR% - cmake -G %GENERATOR% -DCMAKE_INSTALL_PREFIX=install .. - - cmake --build . --config %CONFIGURATION% -- /maxcpucount + - cmake --build . --config %CONFIGURATION% --target install -- /maxcpucount # Generate build files using CMake for the build step. - echo Fetching googletest external dependencies for building validation layer tests - git clone https://github.com/google/googletest.git external/googletest @@ -77,7 +76,7 @@ before_build: - cd %APPVEYOR_BUILD_FOLDER% - mkdir build - cd build - - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers/%BUILD_DIR%/install -DGLSLANG_REPO_ROOT=%APPVEYOR_BUILD_FOLDER%\glslang -DLOADER_REPO_ROOT=%APPVEYOR_BUILD_FOLDER%\Vulkan-Loader .. + - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers/%BUILD_DIR%/install -DGLSLANG_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/glslang/%BUILD_DIR%/install -DVULKAN_LOADER_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Loader/%BUILD_DIR%/install .. - echo Building platform=%PLATFORM% configuration=%CONFIGURATION% platform: |