From a56dd8000e2558c2c9282bf6d5428475cedad054 Mon Sep 17 00:00:00 2001
From: Frederick Roy <frederick.roy@inria.fr>
Date: Fri, 27 Aug 2021 16:05:31 +0200
Subject: [PATCH] fix py3 modules build destination

---
 CMake/SofaPython3Tools.cmake | 2 +-
 CMakeLists.txt               | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake
index b7af839a..30f6a382 100644
--- a/CMake/SofaPython3Tools.cmake
+++ b/CMake/SofaPython3Tools.cmake
@@ -50,7 +50,7 @@ function(SP3_add_python_package)
 
     set(OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${A_TARGET_DIRECTORY})
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        set(OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${A_TARGET_DIRECTORY})
+        set(OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${A_TARGET_DIRECTORY})
     endif()
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5895f9bd..05f10cbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,7 +207,13 @@ install(FILES
 )
 
 if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY)
-    file(GLOB directories RELATIVE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/*")
+    set(SP3_SITE_PACKAGES_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}")
+    if(WIN32)
+        set(SP3_SITE_PACKAGES_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SP3_PYTHON_PACKAGES_DIRECTORY}")
+    endif()
+
+    file(GLOB directories RELATIVE "${SP3_SITE_PACKAGES_OUTPUT_DIRECTORY}" "${SP3_SITE_PACKAGES_OUTPUT_DIRECTORY}/*")
+    
     # Create the site-package link directory if it doesn't exists yet
     install(DIRECTORY DESTINATION ${SP3_PYTHON_PACKAGES_LINK_DIRECTORY})
     foreach(directory ${directories})
@@ -216,7 +222,6 @@ if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_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 "\