From 936ad78d3b540e26bbf445da23b4849f37fcb89c Mon Sep 17 00:00:00 2001 From: jacobkahn Date: Fri, 4 Jun 2021 16:59:30 -0700 Subject: [build] Fix interface include directories for imported targets --- CMakeLists.txt | 10 +++++----- lm/CMakeLists.txt | 1 + lm/builder/CMakeLists.txt | 1 + lm/filter/CMakeLists.txt | 1 + lm/interpolate/CMakeLists.txt | 1 + util/CMakeLists.txt | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a3d102..e303872 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,11 +102,6 @@ find_package(Threads REQUIRED) add_subdirectory(util) add_subdirectory(lm) -foreach(SUBDIR IN ITEMS util util/double-conversion util/stream lm lm/builder lm/common lm/filter lm/interpolate) - file(GLOB HEADERS ${CMAKE_CURRENT_LIST_DIR}/${SUBDIR}/*.h ${CMAKE_CURRENT_LIST_DIR}/${SUBDIR}/*.hh) - install(FILES ${HEADERS} DESTINATION include/kenlm/${SUBDIR}) -endforeach(SUBDIR) - if(ENABLE_PYTHON) add_subdirectory(python) endif() @@ -118,6 +113,11 @@ install(EXPORT kenlmTargets DESTINATION share/kenlm/cmake ) +foreach(SUBDIR IN ITEMS util util/double-conversion util/stream lm lm/builder lm/common lm/filter lm/interpolate) + file(GLOB HEADERS ${CMAKE_CURRENT_LIST_DIR}/${SUBDIR}/*.h ${CMAKE_CURRENT_LIST_DIR}/${SUBDIR}/*.hh) + install(FILES ${HEADERS} DESTINATION include/kenlm/${SUBDIR} COMPONENT headers) +endforeach(SUBDIR) + # Config include(CMakePackageConfigHelpers) # generate the config file that is includes the exports diff --git a/lm/CMakeLists.txt b/lm/CMakeLists.txt index 36d83cf..bb21f12 100644 --- a/lm/CMakeLists.txt +++ b/lm/CMakeLists.txt @@ -58,6 +58,7 @@ install( RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib + INCLUDES DESTINATION include ) AddExes(EXES ${EXE_LIST} diff --git a/lm/builder/CMakeLists.txt b/lm/builder/CMakeLists.txt index ae07d11..668d2b0 100644 --- a/lm/builder/CMakeLists.txt +++ b/lm/builder/CMakeLists.txt @@ -41,6 +41,7 @@ install( RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib + INCLUDES DESTINATION include ) if(BUILD_TESTING) diff --git a/lm/filter/CMakeLists.txt b/lm/filter/CMakeLists.txt index 6fd551d..e223659 100644 --- a/lm/filter/CMakeLists.txt +++ b/lm/filter/CMakeLists.txt @@ -34,4 +34,5 @@ install( RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib + INCLUDES DESTINATION include ) diff --git a/lm/interpolate/CMakeLists.txt b/lm/interpolate/CMakeLists.txt index f83b16e..6376e58 100644 --- a/lm/interpolate/CMakeLists.txt +++ b/lm/interpolate/CMakeLists.txt @@ -42,6 +42,7 @@ if(ENABLE_INTERPOLATE) RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib + INCLUDES DESTINATION include ) if(BUILD_TESTING) diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt index 10741a0..1a70892 100644 --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -94,6 +94,7 @@ install( RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib + INCLUDES DESTINATION include ) if (NOT WIN32) -- cgit v1.2.3