[Spice-commits] 2 commits - appveyor.yml CMakeLists.txt

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jun 16 09:21:59 UTC 2022


 CMakeLists.txt |    4 +++-
 appveyor.yml   |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ccb53f5dfe8773358f35876b9e2e8f1e44fd3941
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Mon Jun 13 11:09:00 2022 +0100

    CI: Use different image to avoid vcpkg update
    
    vcpkg update is time consuming, just use a more recent version.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/appveyor.yml b/appveyor.yml
index 5456bed..8fbd5ff 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,7 @@
 configuration: Release
 
+image: Visual Studio 2019
+
 cache: c:\Tools\vcpkg\installed\
 
 environment:
@@ -14,8 +16,6 @@ install:
 - refreshenv
 
 - cd %VCPKG_ROOT%
-- git pull
-- .\bootstrap-vcpkg.bat
 - vcpkg install libpng:x64-windows-static libpng:x86-windows-static
 
 build_script:
commit e9d487c75bcbdf01ca579d33a8b64063b8a40245
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Mon Jun 13 08:52:00 2022 +0100

    Do not force library prefix for MSVC
    
    Do not use Unix suffix under MSVC (for MingW is fine, not for
    Microsoft standards where .lib is used).
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf67b4a..da554fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,9 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.15")
 endif()
 project(vdagent-win)
 
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+if(NOT MSVC)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+endif()
 
 # configure
 file(WRITE "${CMAKE_BINARY_DIR}/config.h.in" "/* Automatic generated by CMake */\n\n")


More information about the Spice-commits mailing list