From 8b766696a4ef4a2082f72266434044b6824930d1 Mon Sep 17 00:00:00 2001 From: Hugo MacDermott-Opeskin Date: Mon, 24 Oct 2022 17:24:57 +1100 Subject: [PATCH] fix issues with manifest (#124) --- Manifest.in => MANIFEST.in | 2 +- libdistopia/CMakeLists.txt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) rename Manifest.in => MANIFEST.in (95%) diff --git a/Manifest.in b/MANIFEST.in similarity index 95% rename from Manifest.in rename to MANIFEST.in index aad538d7..111349dd 100644 --- a/Manifest.in +++ b/MANIFEST.in @@ -2,7 +2,7 @@ include setup.py include README.md include LICENSE.txt include CMakeLists.txt -incldue requirements.txt +include requirements.txt include pyproject.toml include setup.cfg global-include CMakeLists.txt diff --git a/libdistopia/CMakeLists.txt b/libdistopia/CMakeLists.txt index 66e22368..23a7e58e 100644 --- a/libdistopia/CMakeLists.txt +++ b/libdistopia/CMakeLists.txt @@ -499,7 +499,10 @@ set_target_properties(libdistopia # cmake will append the name lib already , avoid liblibdistopia set_target_properties(libdistopia PROPERTIES OUTPUT_NAME distopia) -set_target_properties(libdistopia PROPERTIES INSTALL_RPATH "\$ORIGIN") - +if(APPLE) + set_target_properties(libdistopia PROPERTIES INSTALL_RPATH "@loader_path") +else() + set_target_properties(libdistopia PROPERTIES INSTALL_RPATH "\$ORIGIN") +endif() install(TARGETS libdistopia DESTINATION distopia)