Skip to content

Commit

Permalink
Merge pull request #267 from abussy-aldebaran/topic/fix-install
Browse files Browse the repository at this point in the history
Changed CMAKE_INSTALL_FULL_<dir> to CMAKE_INSTALL_<dir>
  • Loading branch information
ManifoldFR authored Jan 23, 2025
2 parents 3640df3 + d97008e commit 0e70604
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -444,20 +444,20 @@ ADD_SOURCE_GROUP(LIB_SOURCES)
install(
TARGETS ${PROJECT_NAME}
EXPORT ${TARGETS_EXPORT_NAME}
INCLUDES DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

if(DOWNLOAD_TRACY)
install(
TARGETS TracyClient
EXPORT ${TARGETS_EXPORT_NAME}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/aligator
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/aligator
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/aligator
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/aligator
)
message(
STATUS
"Installing TracyClient target to ${CMAKE_INSTALL_FULL_LIBDIR}/aligator"
"Installing TracyClient target to ${CMAKE_INSTALL_LIBDIR}/aligator"
)
endif()

Expand Down
4 changes: 2 additions & 2 deletions src/compat/crocoddyl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set(INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/compat/crocoddyl)
set(
CROC_INSTALL_INCLUDE_DIR
${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}/compat/crocoddyl
${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/compat/crocoddyl
)

file(GLOB_RECURSE HEADERS ${INCLUDE_DIR}/*.hpp ${INCLUDE_DIR}/*.hxx)
Expand Down Expand Up @@ -36,5 +36,5 @@ install(
TARGETS aligator_croc_compat
EXPORT ${TARGETS_EXPORT_NAME}
PUBLIC_HEADER DESTINATION ${CROC_INSTALL_INCLUDE_DIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

0 comments on commit 0e70604

Please sign in to comment.