From a92d43c9d7334ad704e5c4f30c79fb50182f4b2d Mon Sep 17 00:00:00 2001 From: johannes-wolf Date: Thu, 16 Nov 2023 22:42:18 +0100 Subject: [PATCH] DEBUG CMAKE --- .github/workflows/cmake.yaml | 40 ++---------------------------------- libs/pymapget/CMakeLists.txt | 6 ++++-- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml index f5c6c764..f98a575d 100644 --- a/.github/workflows/cmake.yaml +++ b/.github/workflows/cmake.yaml @@ -7,48 +7,12 @@ on: branches: [ '**' ] jobs: - build-manylinux: - strategy: - matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] - runs-on: ubuntu-latest - container: ghcr.io/klebert-engineering/manylinux-cpp17-py${{ matrix.python-version }}:2023.1 - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: Install Conan - run: | - pip install conan - conan profile detect - - 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 .. - - name: Build - working-directory: build - run: | - . ../venv/bin/activate - cmake --build . - mv bin/wheel bin/wheel-auditme - auditwheel repair bin/wheel-auditme/mapget*.whl -w bin/wheel - - name: Test - working-directory: build - run: | - . ../venv/bin/activate - ctest -C Release --verbose --no-test=fail - - name: Deploy - uses: actions/upload-artifact@v2 - with: - name: mapget-py${{ matrix.python-version }}-ubuntu-latest - path: build/bin/wheel/*.whl build: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, windows-2019] - python-version: ["3.8", "3.9", "3.10", "3.11"] + os: [macos-latest] + python-version: ["3.9"] steps: - uses: actions/checkout@v2 with: diff --git a/libs/pymapget/CMakeLists.txt b/libs/pymapget/CMakeLists.txt index 283d51bc..76cf18c4 100644 --- a/libs/pymapget/CMakeLists.txt +++ b/libs/pymapget/CMakeLists.txt @@ -35,9 +35,11 @@ if (WIN32) "${CMAKE_CURRENT_LIST_DIR}/__main__.py") elseif (APPLE) set(DEPLOY_FILES - "${OPENSSL_INCLUDE_DIR}/../bin/libcrypto.dylib" - "${OPENSSL_INCLUDE_DIR}/../bin/libssl.dylib" + "${OPENSSL_INCLUDE_DIR}/../lib/libcrypto.1.1.dylib" + "${OPENSSL_INCLUDE_DIR}/../lib/libssl.1.1.dylib" "${CMAKE_CURRENT_LIST_DIR}/__main__.py") + execute_process(COMMAND ls -al "${OPENSSL_INCLUDE_DIR}/../lib/") + #message(FATAL_ERROR "======================================") else() set(DEPLOY_FILES "${CMAKE_CURRENT_LIST_DIR}/__main__.py") endif ()