Several fixes for make install (#437)
* Don't install test * Install to the correct directory (e.g. lib64) * Install includes to /usr/include/recastnavigation
This commit is contained in:
parent
eecb7f45ec
commit
9337e12418
@ -11,6 +11,8 @@ option(RECASTNAVIGATION_TESTS "Build tests" ON)
|
||||
option(RECASTNAVIGATION_EXAMPLES "Build examples" ON)
|
||||
option(RECASTNAVIGATION_STATIC "Build static libraries" ON)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
add_subdirectory(DebugUtils)
|
||||
add_subdirectory(Detour)
|
||||
add_subdirectory(DetourCrowd)
|
||||
|
@ -26,10 +26,11 @@ set_target_properties(DebugUtils PROPERTIES
|
||||
)
|
||||
|
||||
install(TARGETS DebugUtils
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
COMPONENT library
|
||||
)
|
||||
|
||||
file(GLOB INCLUDES Include/*.h)
|
||||
install(FILES ${INCLUDES} DESTINATION include)
|
||||
install(FILES ${INCLUDES} DESTINATION
|
||||
${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
|
||||
|
@ -20,10 +20,11 @@ set_target_properties(Detour PROPERTIES
|
||||
)
|
||||
|
||||
install(TARGETS Detour
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
COMPONENT library
|
||||
)
|
||||
|
||||
file(GLOB INCLUDES Include/*.h)
|
||||
install(FILES ${INCLUDES} DESTINATION include)
|
||||
install(FILES ${INCLUDES} DESTINATION
|
||||
${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
|
||||
|
@ -24,10 +24,11 @@ set_target_properties(DetourCrowd PROPERTIES
|
||||
)
|
||||
|
||||
install(TARGETS DetourCrowd
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
COMPONENT library
|
||||
)
|
||||
|
||||
file(GLOB INCLUDES Include/*.h)
|
||||
install(FILES ${INCLUDES} DESTINATION include)
|
||||
install(FILES ${INCLUDES} DESTINATION
|
||||
${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
|
||||
|
@ -25,10 +25,11 @@ set_target_properties(DetourTileCache PROPERTIES
|
||||
|
||||
|
||||
install(TARGETS DetourTileCache
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
COMPONENT library
|
||||
)
|
||||
|
||||
file(GLOB INCLUDES Include/*.h)
|
||||
install(FILES ${INCLUDES} DESTINATION include)
|
||||
install(FILES ${INCLUDES} DESTINATION
|
||||
${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
|
||||
|
@ -20,10 +20,11 @@ set_target_properties(Recast PROPERTIES
|
||||
)
|
||||
|
||||
install(TARGETS Recast
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
COMPONENT library
|
||||
)
|
||||
|
||||
file(GLOB INCLUDES Include/*.h)
|
||||
install(FILES ${INCLUDES} DESTINATION include)
|
||||
install(FILES ${INCLUDES} DESTINATION
|
||||
${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
|
||||
|
@ -8,5 +8,3 @@ add_executable(Tests ${TESTS_SOURCES})
|
||||
add_dependencies(Tests Recast Detour)
|
||||
target_link_libraries(Tests Recast Detour)
|
||||
add_test(Tests Tests)
|
||||
|
||||
install(TARGETS Tests RUNTIME DESTINATION bin)
|
||||
|
Loading…
x
Reference in New Issue
Block a user