From 587fe87f6cad4a75a5bd957795c6bd5d60f92f36 Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Tue, 24 Aug 2021 18:06:28 +0200 Subject: [PATCH] fix packages link copy/link when using intree --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index baa1f7b0..5895f9bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,12 +211,18 @@ if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY) # Create the site-package link directory if it doesn't exists yet install(DIRECTORY DESTINATION ${SP3_PYTHON_PACKAGES_LINK_DIRECTORY}) foreach(directory ${directories}) + if(SP3_COMPILED_AS_SOFA_SUBPROJECT) + set(LINK_SOURCE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/plugins/SofaPython3/lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}) + else() + set(LINK_SOURCE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}) + endif() + if(IS_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}) if(WIN32) install(CODE "\ execute_process( \ COMMAND ${CMAKE_COMMAND} -E copy_directory \ - ${CMAKE_INSTALL_PREFIX}/lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}/ \ + ${LINK_SOURCE_DIRECTORY}/ \ ${SP3_PYTHON_PACKAGES_LINK_DIRECTORY}/${directory} \ )" ) @@ -224,7 +230,7 @@ if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY) install(CODE "\ execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${CMAKE_INSTALL_PREFIX}/lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}/ \ + ${LINK_SOURCE_DIRECTORY}/ \ ${SP3_PYTHON_PACKAGES_LINK_DIRECTORY}/${directory} \ )" )