Set install paths from setup.py and leave rpath

The rpath was actually causing issues for the delocate tool, setting the install paths from setup.py ensures that the right thing is done with the CMAKE_INSTALL_RPATH in the InstallLocation.cmake logic. Signed-off-by: Marcus D. Hanwell <[email protected]>
cryos · Apr 30, 2023 · 0742f76 · 0742f76 · github-actions · Apr 30, 2023
1 parent 58d2c83
commit 0742f76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt
@@ -31,16 +31,6 @@ function(avogadro_add_library name)
       "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
       "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>")
 
-  # Now install everything.
-  # SKBUILD is set for binary wheel
-  if (SKBUILD)
-    # For MACOSX
-    set_target_properties(${name} PROPERTIES INSTALL_NAME_DIR "@rpath")
-    set(INSTALL_RUNTIME_DIR avogadro)
-    set(INSTALL_LIBRARY_DIR avogadro)
-    set(INSTALL_ARCHIVE_DIR avogadro)
-  endif()
-
   # Install the target and its headers.
   install(TARGETS ${name}
     EXPORT "AvogadroLibsTargets"

diff --git a/setup.py b/setup.py
@@ -28,6 +28,9 @@ def wheel_args():
     '-DUSE_HDF5:BOOL=FALSE',
     '-DUSE_LIBARCHIVE:BOOL=FALSE',
     '-DUSE_LIBMSYM:BOOL=FALSE',
+    '-DINSTALL_RUNTIME_DIR:PATH=avogadro',
+    '-DINSTALL_LIBRARY_DIR:PATH=avogadro',
+    '-DINSTALL_ARCHIVE_DIR:PATH=avogadro',
 ] + extra_cmake_args() + wheel_args()
 
 # Add pybind11 if it is installed