w2

dartsim · Mar 15, 2024 · 94b566a · 94b566a
1 parent 0662b42
commit 94b566a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/cmake/DARTConfig.cmake.in b/cmake/DARTConfig.cmake.in
@@ -143,6 +143,9 @@ endfunction()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
+# TODO: Improve the include mechanism
+include(dart_v7Targets)
+
 # Default component: dart
 list(APPEND @PROJECT_NAME_UPPERCASE@_FIND_COMPONENTS dart)
 

diff --git a/cmake/dart_v7_defs.cmake b/cmake/dart_v7_defs.cmake
@@ -81,16 +81,16 @@ function(dart_library)
 
   install(
     TARGETS ${_ARG_NAME}
-    EXPORT ${_ARG_NAME}Targets
+    EXPORT dart_${_ARG_NAME}Targets
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   )
 
   install(
-    EXPORT ${_ARG_NAME}Targets
+    EXPORT dart_${_ARG_NAME}Targets
     NAMESPACE DART::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_ARG_NAME}
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
   )
 
 endfunction()
diff --git a/python/dartpy/CMakeLists.txt b/python/dartpy/CMakeLists.txt
@@ -92,12 +92,11 @@ if(BUILD_SHARED_LIBS)
   )
 endif()
 
+# TODO: Fix installing dartpy to site-packages directory
 # Install the pybind module to site-packages directory
-if(TARGET ${pybind_module})
-  install(TARGETS ${pybind_module}
-    LIBRARY DESTINATION "${PYTHON_SITE_PACKAGES}"
-  )
-endif()
+# install(TARGETS ${pybind_module}
+#   LIBRARY DESTINATION "${PYTHON_SITE_PACKAGES}"
+# )
 
 list(REMOVE_ITEM dartpy_headers
   ${CMAKE_CURRENT_LIST_DIR}/eigen_geometry_pybind.h