Skip to content

Commit 0e70604

Browse files
authored
Merge pull request #267 from abussy-aldebaran/topic/fix-install
Changed CMAKE_INSTALL_FULL_<dir> to CMAKE_INSTALL_<dir>
2 parents 3640df3 + d97008e commit 0e70604

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -444,20 +444,20 @@ ADD_SOURCE_GROUP(LIB_SOURCES)
444444
install(
445445
TARGETS ${PROJECT_NAME}
446446
EXPORT ${TARGETS_EXPORT_NAME}
447-
INCLUDES DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
448-
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
447+
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
448+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
449449
)
450450

451451
if(DOWNLOAD_TRACY)
452452
install(
453453
TARGETS TracyClient
454454
EXPORT ${TARGETS_EXPORT_NAME}
455-
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/aligator
456-
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/aligator
455+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/aligator
456+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/aligator
457457
)
458458
message(
459459
STATUS
460-
"Installing TracyClient target to ${CMAKE_INSTALL_FULL_LIBDIR}/aligator"
460+
"Installing TracyClient target to ${CMAKE_INSTALL_LIBDIR}/aligator"
461461
)
462462
endif()
463463

src/compat/crocoddyl/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/compat/crocoddyl)
22
set(
33
CROC_INSTALL_INCLUDE_DIR
4-
${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}/compat/crocoddyl
4+
${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/compat/crocoddyl
55
)
66

77
file(GLOB_RECURSE HEADERS ${INCLUDE_DIR}/*.hpp ${INCLUDE_DIR}/*.hxx)
@@ -36,5 +36,5 @@ install(
3636
TARGETS aligator_croc_compat
3737
EXPORT ${TARGETS_EXPORT_NAME}
3838
PUBLIC_HEADER DESTINATION ${CROC_INSTALL_INCLUDE_DIR}
39-
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
39+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
4040
)

0 commit comments

Comments
 (0)