diff options
| author | Ruslan Baratov <ruslan_baratov@yahoo.com> | 2018-07-10 12:54:34 +0300 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-08-08 09:39:05 +0200 |
| commit | c892795ea3601a6d210a325b2ac566b1c30d3334 (patch) | |
| tree | e592d99b424df310ccff5a45dd602aba91af4062 /appveyor.yml | |
| parent | f826b4ce980014550da752a87fa86cc3d7e50b97 (diff) | |
| download | curl-c892795ea3601a6d210a325b2ac566b1c30d3334.tar.gz | |
CMake: Respect BUILD_SHARED_LIBS
Use standard CMake variable BUILD_SHARED_LIBS instead of introducing
custom option CURL_STATICLIB.
Use '-DBUILD_SHARED_LIBS=%SHARED%' in appveyor.yml.
Reviewed-by: Sergei Nikulov
Closes #2755
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/appveyor.yml b/appveyor.yml index e2664b4cb..b39a23446 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,66 +7,66 @@ environment: PRJ_CFG: Release OPENSSL: OFF TESTING: OFF - STATICLIB: OFF + SHARED: ON - PRJ_GEN: "Visual Studio 12 2013 Win64" BDIR: msvc2013 PRJ_CFG: Release OPENSSL: OFF TESTING: OFF - STATICLIB: OFF + SHARED: ON - PRJ_GEN: "Visual Studio 14 2015 Win64" BDIR: msvc2015 PRJ_CFG: Release OPENSSL: OFF TESTING: OFF - STATICLIB: OFF + SHARED: ON - PRJ_GEN: "Visual Studio 11 2012 Win64" BDIR: msvc2012 PRJ_CFG: Release OPENSSL: ON TESTING: OFF - STATICLIB: OFF + SHARED: ON - PRJ_GEN: "Visual Studio 12 2013 Win64" BDIR: msvc2013 PRJ_CFG: Release OPENSSL: ON TESTING: OFF - STATICLIB: OFF + SHARED: ON - PRJ_GEN: "Visual Studio 14 2015 Win64" BDIR: msvc2015 PRJ_CFG: Release OPENSSL: ON TESTING: OFF - STATICLIB: OFF + SHARED: ON - PRJ_GEN: "Visual Studio 11 2012 Win64" BDIR: msvc2012 PRJ_CFG: Release OPENSSL: OFF TESTING: ON - STATICLIB: ON + SHARED: OFF - PRJ_GEN: "Visual Studio 12 2013 Win64" BDIR: msvc2013 PRJ_CFG: Release OPENSSL: OFF TESTING: ON - STATICLIB: ON + SHARED: OFF - PRJ_GEN: "Visual Studio 14 2015 Win64" BDIR: msvc2015 PRJ_CFG: Release OPENSSL: OFF TESTING: ON - STATICLIB: ON + SHARED: OFF - PRJ_GEN: "Visual Studio 14 2015" BDIR: msvc2015 PRJ_CFG: Release OPENSSL: OFF TESTING: ON - STATICLIB: ON + SHARED: OFF build_script: - mkdir build.%BDIR% - cd build.%BDIR% - - cmake .. -G"%PRJ_GEN%" -DCMAKE_USE_OPENSSL=%OPENSSL% -DCURL_STATICLIB=%STATICLIB% -DBUILD_TESTING=%TESTING% -DCURL_WERROR=ON + - cmake .. -G"%PRJ_GEN%" -DCMAKE_USE_OPENSSL=%OPENSSL% -DBUILD_SHARED_LIBS=%SHARED% -DBUILD_TESTING=%TESTING% -DCURL_WERROR=ON - cmake --build . --config %PRJ_CFG% --clean-first # whitelist branches to avoid testing feature branches twice (as branch and as pull request) |