From 8a5f9f4488adfd9810e221c1d7ec2adaff9c23af Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Thu, 23 Jan 2025 14:21:10 +0100 Subject: [PATCH] update --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 4 ++++ LICENSE.md | 2 +- pack/CMakeLists.txt | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2606f3483..9fd194bb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,7 +139,7 @@ jobs: cmake_env: {} - name: macos - os: macos-12 + os: macos-13 ninja_platform: mac qt_platform: mac openssl_arch: darwin64-x86_64-cc diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bd47318e..f140c08fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,10 @@ set(LUA_MODULES_PATH "Path to the directory with native Lua modules (only relevant if system-wide Lua installation is used)" ) +if (NOT USE_SYSTEM_LIBSSH2) + set(USE_SSH "localbuild") +endif() + # Require C++17. set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) diff --git a/LICENSE.md b/LICENSE.md index 4722beb8b..2d7800c59 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ MIT License Copyright (c) 2018 Scientific Toolworks, Inc. -Copyright (c) 2021-2024 Gittyup contributors +Copyright (c) 2021-2025 Gittyup contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt index 330d3b40a..3729d2e0e 100644 --- a/pack/CMakeLists.txt +++ b/pack/CMakeLists.txt @@ -183,7 +183,6 @@ if(NOT APPLE) WORLD_READ WORLD_EXECUTE COMPONENT ${GITTYUP_NAME} - OPTIONAL # if we use the system libssh, we have not built openssl ) endforeach() endif()