From 9dfa187569e4c9c4e72ace60c051cbfa79434d77 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 14 Feb 2020 13:43:27 -0800 Subject: [PATCH] install headers into versioned directory --- CMakeLists.txt | 1 + templates/lib/CMakeLists.txt | 6 ++++-- textdocument/lib/CMakeLists.txt | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20edcdc..8df3dd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6 set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} ) +set( INCLUDE_INSTALL_DIR include/Grantlee5 ) # set up RPATH/install_name_dir set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt index 5058481..c4262f3 100644 --- a/templates/lib/CMakeLists.txt +++ b/templates/lib/CMakeLists.txt @@ -106,6 +106,8 @@ if (Qt5Qml_FOUND) ) endif() +target_include_directories(Grantlee_Templates INTERFACE "$") + if (BUILD_TESTS) set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT") endif() @@ -152,10 +154,10 @@ install(FILES token.h util.h variable.h - DESTINATION include/grantlee COMPONENT Templates + DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT Templates ) install(FILES grantlee_templates.h - DESTINATION include COMPONENT Templates + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Templates ) --- a/textdocument/lib/CMakeLists.txt +++ b/textdocument/lib/CMakeLists.txt @@ -35,6 +35,10 @@ if (CMAKE_GENERATOR MATCHES "Visual Stud endforeach() endif() +target_include_directories(Grantlee_TextDocument + INTERFACE "$" +) + if (GRANTLEE_BUILD_WITH_QT6) target_link_libraries(Grantlee_TextDocument PUBLIC Qt6::Gui @@ -65,10 +69,10 @@ install(FILES texthtmlbuilder.h mediawikimarkupbuilder.h ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h - DESTINATION include/grantlee COMPONENT TextDocument + DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT TextDocument ) install(FILES grantlee_textdocument.h - DESTINATION include COMPONENT TextDocument + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT TextDocument )