fix: use correct path for the version include file

abdes · Sep 19, 2022 · 7997b68 · 7997b68
1 parent 71483e6
commit 7997b68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cmake/AsapInstall.cmake b/cmake/AsapInstall.cmake
@@ -85,7 +85,7 @@ if(${META_PROJECT_ID}_INSTALL)
 
   # Install generated header files
   install(
-    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_NAME}
+    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_ID_LOWER}
     DESTINATION ${ASAP_INSTALL_INCLUDE}
     COMPONENT ${dev})
 

diff --git a/tools/version-info/CMakeLists.txt b/tools/version-info/CMakeLists.txt
@@ -48,10 +48,12 @@ asap_add_executable(${MODULE_TARGET_NAME} WARNING SOURCES "src/main.cpp")
 
 target_compile_features(${MODULE_TARGET_NAME} PUBLIC cxx_constexpr)
 
+target_compile_features(${MODULE_TARGET_NAME} PUBLIC cxx_constexpr)
+cmake_path(SET version_include_dir ${CMAKE_CURRENT_BINARY_DIR}/../../include
+           NORMALIZE)
 target_include_directories(
   ${MODULE_TARGET_NAME}
-  PUBLIC $<INSTALL_INTERFACE:include>
-         $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
+  PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${version_include_dir}>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 # ------------------------------------------------------------------------------