gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnurl] 42/63: appveyor: add support for other build system


From: gnunet
Subject: [GNUnet-SVN] [gnurl] 42/63: appveyor: add support for other build systems
Date: Fri, 07 Jun 2019 18:37:04 +0200

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 44ea2bef38f3f66f6c4f2ef5f965c7008e628c26
Author: Marcel Raad <address@hidden>
AuthorDate: Sat May 25 08:38:17 2019 +0200

    appveyor: add support for other build systems
    
    Introduce BUILD_SYSTEM variable, which is currently always CMake.
    
    Closes https://github.com/curl/curl/pull/3941
---
 appveyor.yml | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1e591b54e..7e7cfc18d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,7 @@ version: 7.50.0.{build}
 environment:
     matrix:
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+        BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 9 2008"
         PRJ_CFG: Release
         OPENSSL: OFF
@@ -13,6 +14,7 @@ environment:
         DISABLED_TESTS: ""
         COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+        BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 15 2017 Win64"
         PRJ_CFG: Debug
         OPENSSL: OFF
@@ -23,6 +25,7 @@ environment:
         DISABLED_TESTS: ""
         COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+        BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 15 2017 Win64"
         PRJ_CFG: Release
         OPENSSL: ON
@@ -33,6 +36,7 @@ environment:
         DISABLED_TESTS: ""
         COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+        BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 10 2010 Win64"
         PRJ_CFG: Debug
         OPENSSL: OFF
@@ -43,6 +47,7 @@ environment:
         DISABLED_TESTS: ""
         COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+        BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 15 2017 Win64"
         PRJ_CFG: Debug
         OPENSSL: OFF
@@ -53,6 +58,7 @@ environment:
         DISABLED_TESTS: ""
         COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+        BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 15 2017 Win64"
         PRJ_CFG: Debug
         OPENSSL: OFF
@@ -63,6 +69,7 @@ environment:
         DISABLED_TESTS: ""
         COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+        BUILD_SYSTEM: CMake
         PRJ_GEN: "MSYS Makefiles"
         PRJ_CFG: Debug
         OPENSSL: OFF
@@ -74,6 +81,7 @@ environment:
         COMPILER_PATH: 
"C:\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin"
         MSYS2_ARG_CONV_EXCL: "/*"
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+        BUILD_SYSTEM: CMake
         PRJ_GEN: "MSYS Makefiles"
         PRJ_CFG: Debug
         OPENSSL: OFF
@@ -91,20 +99,21 @@ install:
         set "PATH=%COMPILER_PATH%;%PATH%" )
 
 build_script:
-    - cmake .
-      -G"%PRJ_GEN%"
-      -DCMAKE_USE_OPENSSL=%OPENSSL%
-      -DCMAKE_USE_WINSSL=%WINSSL%
-      -DHTTP_ONLY=%HTTP_ONLY%
-      -DBUILD_SHARED_LIBS=%SHARED%
-      -DBUILD_TESTING=%TESTING%
-      -DCURL_WERROR=ON
-      -DENABLE_DEBUG=ON
-      -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=""
-      -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=""
-      -DCMAKE_INSTALL_PREFIX="C:/CURL"
-      -DCMAKE_BUILD_TYPE=%PRJ_CFG%
-    - cmake --build . --config %PRJ_CFG% --clean-first
+    - if %BUILD_SYSTEM%==CMake (
+        cmake .
+        -G"%PRJ_GEN%"
+        -DCMAKE_USE_OPENSSL=%OPENSSL%
+        -DCMAKE_USE_WINSSL=%WINSSL%
+        -DHTTP_ONLY=%HTTP_ONLY%
+        -DBUILD_SHARED_LIBS=%SHARED%
+        -DBUILD_TESTING=%TESTING%
+        -DCURL_WERROR=ON
+        -DENABLE_DEBUG=ON
+        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=""
+        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=""
+        -DCMAKE_INSTALL_PREFIX="C:/CURL"
+        -DCMAKE_BUILD_TYPE=%PRJ_CFG% &&
+        cmake --build . --config %PRJ_CFG% --clean-first )
 
 test_script:
     - if %TESTING%==ON (

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]