DEBUG CMAKE

ndsev · Nov 16, 2023 · a92d43c · a92d43c
1 parent ef9818c
commit a92d43c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 40 deletions.
diff --git 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
@@ -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 ()