Try with CMAKE_INSTALL_RPATH @loader_path on mac

jmarrec · Jun 10, 2024 · cf65688 · cf65688
1 parent 18fb567
commit cf65688
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/.github/workflows/build_python.yml b/.github/workflows/build_python.yml
@@ -2,7 +2,7 @@ name: C++ CI
 
 on:
   push:
-    branches: [ python_linking ]
+    branches: [ python_workaround ]
     # Sequence of patterns matched against refs/tags
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
@@ -20,7 +20,7 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-14, windows-latest]
+        os: [ubuntu-22.04, macos-13, macos-14]
         include:
         - os: ubuntu-22.04
           arch: x86_64
@@ -31,9 +31,6 @@ jobs:
         - os: macos-14
           arch: arm64
           python-arch: arm64
-        - os: windows-latest
-          arch: x86_64
-          python-arch: x64
 
     steps:
     - uses: actions/checkout@v4
@@ -135,7 +132,7 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-14, windows-latest]
+        os: [ubuntu-22.04, macos-13, macos-14]
         include:
         - os: ubuntu-22.04
           arch: x86_64
@@ -146,9 +143,6 @@ jobs:
         - os: macos-14
           arch: arm64
           python-arch: arm64
-        - os: windows-latest
-          arch: x86_64
-          python-arch: x64
 
     steps:
     - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,9 @@ cmake_policy(SET CMP0048 NEW) # handling project_version_* variables
 
 project(TestPython VERSION 0.0.1)
 
-if(UNIX AND NOT APPLE)
+if(APPLE)
+  set(CMAKE_INSTALL_RPATH "@loader_path")
+elseif(UNIX)
   set(CMAKE_INSTALL_RPATH "$ORIGIN")
 endif()
 
@@ -53,15 +55,15 @@ install(
     -P ${PROJECT_SOURCE_DIR}/cmake/PythonGetLibAndLinkUp.cmake
   )")
 
-if(APPLE)
-  install(
-    CODE "execute_process(
-      COMMAND ${CMAKE_COMMAND}
-      -DRESOLVED_PYTHON_LIB=${RESOLVED_PYTHON_LIBRARY}
-      -DEXECUTABLE_PATH=\${CMAKE_INSTALL_PREFIX}/test${CMAKE_EXECUTABLE_SUFFIX}
-      -P ${PROJECT_SOURCE_DIR}/cmake/PythonFixUpOnMac.cmake
-    )")
-endif()
+# if(APPLE)
+#   install(
+#     CODE "execute_process(
+#       COMMAND ${CMAKE_COMMAND}
+#       -DRESOLVED_PYTHON_LIB=${RESOLVED_PYTHON_LIBRARY}
+#       -DEXECUTABLE_PATH=\${CMAKE_INSTALL_PREFIX}/test${CMAKE_EXECUTABLE_SUFFIX}
+#       -P ${PROJECT_SOURCE_DIR}/cmake/PythonFixUpOnMac.cmake
+#     )")
+# endif()
 
 set(CPACK_GENERATOR "TGZ")
 include(CPack)