Skip to content

Commit

Permalink
deps: Add OpenSSL
Browse files Browse the repository at this point in the history
  • Loading branch information
johannes-wolf committed Nov 16, 2023
1 parent 91e4901 commit 36eff7c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/cmake.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
- name: Configure
run: |
python3 -m venv venv && . ./venv/bin/activate
pip install -U setuptools wheel pip
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release ..
pip install -U setuptools wheel pip ninja
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -GNinja ..
- name: Build
working-directory: build
run: |
Expand Down Expand Up @@ -68,8 +68,6 @@ jobs:
working-directory: build
run: |
python -m pip install delocate
brew install openssl
export OPENSSL_ROOT_DIR=$(brew --prefix openssl)
export MACOSX_DEPLOYMENT_TARGET=10.15
cmake -DPython3_ROOT_DIR=$pythonLocation \
-DPython3_FIND_FRAMEWORK=LAST \
Expand All @@ -86,7 +84,6 @@ jobs:
env:
CMAKE_GENERATOR: "Visual Studio 16 2019"
run: |
choco install --no-progress -y openssl --version=1.1.1.2100
echo "cmake -DPython3_ROOT_DIR=$env:pythonLocation"
cmake "-DPython3_ROOT_DIR=$env:pythonLocation" -DPython3_FIND_REGISTRY=LAST -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=OFF -DCMAKE_BUILD_TYPE=Release ..
cmake --build . --config Release
Expand Down
1 change: 1 addition & 0 deletions conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ cpp-httplib/0.14.1
yaml-cpp/0.8.0
cli11/2.3.2
pybind11/2.11.1
openssl/1.1.1w

[generators]
CMakeDeps
Expand Down
4 changes: 2 additions & 2 deletions libs/pymapget/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ target_compile_features(pymapget
if (MSVC)
# Required because cpp-httplib speaks https via OpenSSL
set(DEPLOY_FILES
"${OPENSSL_INCLUDE_DIR}/../libcrypto-1_1-x64.dll"
"${OPENSSL_INCLUDE_DIR}/../libssl-1_1-x64.dll"
"${OPENSSL_INCLUDE_DIR}/../bin/libcrypto-1_1-x64.dll"
"${OPENSSL_INCLUDE_DIR}/../bin/libssl-1_1-x64.dll"
"${CMAKE_CURRENT_LIST_DIR}/__main__.py")
else()
set(DEPLOY_FILES "${CMAKE_CURRENT_LIST_DIR}/__main__.py")
Expand Down

0 comments on commit 36eff7c

Please sign in to comment.