diff options
| author | Howard Butler <howard@hobu.co> | 2016-08-22 16:40:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-22 16:40:24 -0500 |
| commit | da2d678c387ba76704824360dc52771c29d94693 (patch) | |
| tree | f74f79b400855cd014cd0e91e2a9c0e0c43235a3 /appveyor.yml | |
| parent | e103f3f962e5ddc6c837f4b8b0bcdc437b5f52d1 (diff) | |
| parent | 6a921265db9ff12a263ff1a88118a69a65b7a2df (diff) | |
| download | PROJ-4.9.3.tar.gz PROJ-4.9.3.zip | |
Merge pull request #405 from kbevers/selftest-compile-flag4.9.3
Changed self-test build behaviour from opt-out to opt-in
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index 9d1df0a5..9397d627 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,16 +31,16 @@ build_script: - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x86" call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 - - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc + - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc SELFTEST=1 - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc install-all - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" cd src - - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" nmake /f makefile.vc multistresstest.exe + - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" nmake /f makefile.vc SELFTEST=1 multistresstest.exe # Disabled for now as it scales badly # - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" multistresstest.exe - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" SET VS_FULL=%VS_VERSION% - if "%BUILD_TYPE%" == "cmake" echo "%VS_FULL%" - - if "%BUILD_TYPE%" == "cmake" cmake -G "%VS_FULL%" . -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=../bin -DBUILD_LIBPROJ_SHARED=ON + - if "%BUILD_TYPE%" == "cmake" cmake -G "%VS_FULL%" . -DSELFTEST=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=../bin -DBUILD_LIBPROJ_SHARED=ON - if "%BUILD_TYPE%" == "cmake" cmake --build . --config Release test_script: |