Merge pull request OpenChemistry#1279 from cryos/python-module

Python module
cryos · Apr 30, 2023 · 61558e8 · 61558e8
2 parents 093ade3 + 0742f76
commit 61558e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 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/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -17,7 +17,7 @@ set(wrapper_SRCS
 set(_python_module_install_dir "avogadro")
 # SKBUILD is set for binary wheel
 if (NOT SKBUILD)
-  set(_python_module_install_dir "${INSTALL_LIBRARY_DIR}/avogadro")
+  set(_python_module_install_dir "${Python_STDARCH}/avogadro")
 endif()
 
 set(CMAKE_MODULE_LINKER_FLAGS "")

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