From 7212ee47eba3b6affe271f25fdf0602d3e57dff1 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 28 Dec 2016 11:11:59 -0500 Subject: [PATCH] Use GNUInstallDirs module and fix cmake directory location --- CMakeLists.txt | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8cbea5..2b4e06a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,10 +25,14 @@ set(tinyobjloader-examples-objsticher ) #Install destinations -set(TINYOBJLOADER_CMAKE_DIR lib/cmake) -set(TINYOBJLOADER_INCLUDE_DIR include) -set(TINYOBJLOADER_LIBRARY_DIR lib) -set(TINYOBJLOADER_PKGCONFIG_DIR lib/pkgconfig) +include(GNUInstallDirs) + +set(TINYOBJLOADER_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake) +set(TINYOBJLOADER_DOC_DIR ${CMAKE_INSTALL_DOCDIR}) +set(TINYOBJLOADER_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) +set(TINYOBJLOADER_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}) +set(TINYOBJLOADER_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +set(TINYOBJLOADER_RUNTIME_DIR ${CMAKE_INSTALL_BINDIR}) option(TINYOBJLOADER_BUILD_TEST_LOADER "Build Example Loader Application" OFF) option(TINYOBJLOADER_COMPILATION_SHARED "Build as shared library" OFF) @@ -64,7 +68,7 @@ if(TINYOBJLOADER_BUILD_OBJ_STICHER) install(TARGETS obj_sticher DESTINATION - bin + ${TINYOBJLOADER_RUNTIME_DIR} ) endif() @@ -101,7 +105,7 @@ install(TARGETS PUBLIC_HEADER DESTINATION ${TINYOBJLOADER_INCLUDE_DIR} RUNTIME DESTINATION - bin + ${TINYOBJLOADER_RUNTIME_DIR} ) install(EXPORT ${PROJECT_NAME}-targets @@ -113,6 +117,11 @@ install(FILES DESTINATION ${TINYOBJLOADER_INCLUDE_DIR} ) +install(FILES + LICENSE + DESTINATION + ${TINYOBJLOADER_DOC_DIR} + ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader-config-version.cmake"