diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-02-21 15:40:35 +1300 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2020-02-21 22:43:30 +1300 |
| commit | 2336ac77b53068b7a7d5618764a13a52c428a332 (patch) | |
| tree | 95874f52248d1d41a89a1d26bb0a3677f4376199 /appveyor.yml | |
| parent | 86530f3146ec091c26652e60067088dc3e067fae (diff) | |
| download | PROJ-2336ac77b53068b7a7d5618764a13a52c428a332.tar.gz PROJ-2336ac77b53068b7a7d5618764a13a52c428a332.zip | |
CMake: rename BUILD_LIBPROJ_SHARED to BUILD_SHARED_LIBS
* Deprecate BUILD_LIBPROJ_SHARED, but still use it as an alias for now
* Rename BUILD_LIBPROJ_SHARED_DEFAULT to BUILD_SHARED_LIBS_DEFAULT
* Keep previous defaults (UNIX as shared and Windows as static)
* Remove PROJ_LIBRARY_TYPE, since add_library() uses BUILD_SHARED_LIBS
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 31cca55c..fdce5268 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,9 +30,9 @@ build_script: - vcpkg install tiff:"%platform%"-windows - vcpkg install curl:"%platform%"-windows - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 - - if "%platform%" == "x64" SET BUILD_LIBPROJ_SHARED=ON + - if "%platform%" == "x64" SET BUILD_SHARED_LIBS=ON - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION% - - if "%platform%" == "x86" SET BUILD_LIBPROJ_SHARED=OFF + - if "%platform%" == "x86" SET BUILD_SHARED_LIBS=OFF - echo "%VS_FULL%" # - cd %APPVEYOR_BUILD_FOLDER%\data @@ -42,7 +42,7 @@ build_script: - mkdir %PROJ_BUILD% - cd %PROJ_BUILD% - set PROJ_DIR=%APPVEYOR_BUILD_FOLDER%\proj_dir - - cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED="%BUILD_LIBPROJ_SHARED%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=C:/projects/proj/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%" + - cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS="%BUILD_SHARED_LIBS%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=C:/projects/proj/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%" - cmake --build . --config Release --target install - copy c:\projects\proj\vcpkg\installed\"%platform%"-windows\bin\*.dll %PROJ_DIR%\bin - dir %PROJ_DIR%\bin |