Merge pull request #75 from stigrj/release/0.2

Cherry-pick path fix from master
MRChemSoft · Oct 14, 2021 · b9c6c0b · b9c6c0b
2 parents c897383 + 44a20b9
commit b9c6c0b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/vampyr/CMakeLists.txt b/src/vampyr/CMakeLists.txt
@@ -20,9 +20,9 @@ target_link_libraries(_vampyr
 
 file(RELATIVE_PATH _rel ${CMAKE_INSTALL_PREFIX}/${PYMOD_INSTALL_FULLDIR} ${CMAKE_INSTALL_PREFIX})
 if(APPLE)
-  set(_RPATH "@loader_path/${_rel};@loader_path/${CMAKE_INSTALL_LIBDIR}")
+  set(_RPATH "@loader_path/${_rel}/lib;@loader_path/${CMAKE_INSTALL_LIBDIR}")
 else()
-  set(_RPATH "\$ORIGIN/${_rel};\$ORIGIN/${CMAKE_INSTALL_LIBDIR}")
+  set(_RPATH "\$ORIGIN/${_rel}/lib;\$ORIGIN/${CMAKE_INSTALL_LIBDIR}")
 endif()
 
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${PYMOD_INSTALL_FULLDIR})
@@ -48,7 +48,7 @@ set_target_properties(_vampyr
     MACOSX_RPATH ON
     SKIP_BUILD_RPATH OFF
     BUILD_WITH_INSTALL_RPATH OFF
-    INSTALL_RPATH "${_RPATH}lib"
+    INSTALL_RPATH "${_RPATH}"
     INSTALL_RPATH_USE_LINK_PATH ON
     PREFIX "${PYTHON_MODULE_PREFIX}"
     SUFFIX "${PYTHON_MODULE_EXTENSION}"