Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/conan: Use native Windows SSL library for reduced binary size #49

Closed
wants to merge 3 commits into from
Closed

Feature/conan: Use native Windows SSL library for reduced binary size #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c89690
Use conanfile.py instead of conanfile.txt for better configuration op…
Miuwys Jun 23, 2024
05a329c
libcurl: Use different SSL implementation (schannel) for reduced bina…
Miuwys Jun 23, 2024
72b19d4
Rename conan recipe
Miuwys Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
cache-name: cache-conan-packages
with:
path: ~/.conan2/p
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.txt') }}
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.py') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
Expand All @@ -78,7 +78,7 @@ jobs:
if: always()
with:
path: ~/.conan2/p
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.txt') }}
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.py') }}

- name: Configure CMake
run: cmake -B build --preset conan-default -DCMAKE_BUILD_TYPE=${{env.BUILD_CONFIGURATION}} -A Win32 -DDEV_BUILD=ON -DDEV_RELEASE_NUMBER="${{ env.DEV_RELEASE }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
cache-name: cache-conan-packages
with:
path: ~/.conan2/p
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.txt') }}
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.py') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
Expand All @@ -71,7 +71,7 @@ jobs:
if: always()
with:
path: ~/.conan2/p
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.txt') }}
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/conanfile.py') }}

- name: Configure CMake
run: cmake -B build --preset conan-default -DCMAKE_BUILD_TYPE=${{env.BUILD_CONFIGURATION}} -A Win32
Expand Down
16 changes: 16 additions & 0 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
from conan.tools.cmake import cmake_layout
from conan import ConanFile


class vACDMRecipe(ConanFile):
settings = "os", "compiler", "build_type", "arch"
generators = "CMakeToolchain", "CMakeDeps"

def requirements(self):
self.requires("jsoncpp/1.9.5")
self.requires("libcurl/8.6.0", options={"with_ssl": "schannel"})
self.requires("geographiclib/2.3")
self.requires("sqlite3/3.45.3")

def layout(self):
cmake_layout(self)
11 changes: 0 additions & 11 deletions conanfile.txt
View file
Open in desktop

This file was deleted.

Loading