From 532ebcd2d1e722e73aa09a49e77ebaa79cc05e3e Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 5 Jul 2024 08:58:07 +0800 Subject: `make install` on macOS copies resources to bundle Except for SLPlugin since there's already a custom command for it. --- indra/llplugin/slplugin/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llplugin') diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index e86ddd8a32..cdf77187c3 100644 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt @@ -65,7 +65,7 @@ if (BUILD_SHARED_LIBS) "${LINK_FLAGS_RELEASE} -Wl,--allow-shlib-undefined") endif () -if (INSTALL) +if (INSTALL AND NOT DARWIN) install(TARGETS ${PROJECT_NAME} DESTINATION libexec/${VIEWER_BINARY_NAME}) endif () -- cgit v1.2.3 From 2775a604a0432132e251a74067d06a30f864523c Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 5 Jul 2024 12:00:15 +0800 Subject: `make install` on macOS installs SLPlugin app Turns out the custom command was only for bundling it, not necessarily installing it. --- indra/llplugin/slplugin/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'indra/llplugin') diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index cdf77187c3..c3752a4705 100644 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt @@ -65,9 +65,14 @@ if (BUILD_SHARED_LIBS) "${LINK_FLAGS_RELEASE} -Wl,--allow-shlib-undefined") endif () -if (INSTALL AND NOT DARWIN) - install(TARGETS ${PROJECT_NAME} DESTINATION libexec/${VIEWER_BINARY_NAME}) -endif () +if (INSTALL) + if (DARWIN) + install(TARGETS ${PROJECT_NAME} + DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources) + else (DARWIN) + install(TARGETS ${PROJECT_NAME} DESTINATION libexec/${VIEWER_BINARY_NAME}) + endif (DARWIN) +endif (INSTALL) if (LL_TESTS) ll_deploy_sharedlibs_command(SLPlugin) -- cgit v1.2.3