[build] Fix interface include directories for imported targets

harveenchadha · Jun 4, 2021 · 936ad78 · 936ad78
1 parent bdf3c71
commit 936ad78
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -94,6 +94,7 @@ install(
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
+  INCLUDES DESTINATION include
 )
 
 if (NOT WIN32)