From b116da49ed89637fb5c28a629bdfcc020f692735 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Tue, 27 Apr 2021 09:05:59 +0200 Subject: [PATCH 1/2] [CMake] FIX SofaPython3Tools location Move SofaPython3Tools from `CMake` to `lib/cmake` in build tree and install tree. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e6bd342..114efc5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,9 +190,9 @@ sofa_create_package( RELOCATABLE "plugins" ) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CMake/SofaPython3Tools.cmake" "${CMAKE_BINARY_DIR}/cmake/SofaPython3Tools.cmake" COPYONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CMake/SofaPython3Tools.cmake" "${CMAKE_BINARY_DIR}/lib/cmake/SofaPython3Tools.cmake" COPYONLY) install(FILES - "${CMAKE_CURRENT_SOURCE_DIR}/CMake/SofaPython3Tools.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/lib/cmake/SofaPython3Tools.cmake" DESTINATION lib/cmake/SofaPython3 COMPONENT headers ) From 366dfb3d49a0ae6d86ccf9e91972826a4b2cbf25 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Tue, 27 Apr 2021 09:07:04 +0200 Subject: [PATCH 2/2] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 114efc5d..9603e10f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,7 +192,7 @@ sofa_create_package( configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CMake/SofaPython3Tools.cmake" "${CMAKE_BINARY_DIR}/lib/cmake/SofaPython3Tools.cmake" COPYONLY) install(FILES - "${CMAKE_CURRENT_SOURCE_DIR}/lib/cmake/SofaPython3Tools.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/CMake/SofaPython3Tools.cmake" DESTINATION lib/cmake/SofaPython3 COMPONENT headers )