fix: Missing dtkdeclarative_config.h in dev package

Install dtkdeclarative_config.h
linuxdeepin · Jul 10, 2023 · 403ac3d · 403ac3d
1 parent 24e5016
commit 403ac3d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/cmake/DtkBuildConfig.cmake b/cmake/DtkBuildConfig.cmake
@@ -40,7 +40,7 @@ include(CMakeParseArguments)
 #    ==== file content end ====
 #
 function(GEN_DTK_CONFIG_HEADER)
-    set(oneValueArgs MODULE_NAME DEST_DIR)
+    set(oneValueArgs MODULE_NAME DEST_DIR OUTPUT_VARIABLE)
     set(multiValueArgs HEADERS EXT_CONTENTS)
 
     cmake_parse_arguments(_CONFIG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -80,5 +80,6 @@ function(GEN_DTK_CONFIG_HEADER)
         string(TOUPPER ${_CONFIG_MODULE_NAME} _UP_MODULE_NAME)
         file(APPEND ${config_file_path} "#define ${_UP_MODULE_NAME}_CLASS_${classname}\n")
     endforeach()
-
+
+    set(${_CONFIG_OUTPUT_VARIABLE} ${config_file_path} PARENT_SCOPE)
 endfunction()
diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt
@@ -136,7 +136,8 @@ target_link_directories(${LIB_NAME} INTERFACE
 # gen dtkdeclarative_config.h
 include(DtkBuildConfig)
 set(options MSG) # print MODULE_NAME D_HEADERS DEST_DIR
-gen_dtk_config_header(MODULE_NAME ${LIB_NAME} HEADERS ${D_HEADERS})
+gen_dtk_config_header(MODULE_NAME ${LIB_NAME} HEADERS ${D_HEADERS} DEST_DIR ${CMAKE_CURRENT_LIST_DIR}/src OUTPUT_VARIABLE CONFIG_PATH)
+list(APPEND PUBLIC_HEADERS ${CONFIG_PATH})
 
 # Install library
 install(TARGETS ${LIB_NAME} EXPORT DtkDeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -91,7 +91,8 @@ target_link_directories(${LIB_NAME} INTERFACE
 # gen dtkdeclarative_config.h
 include(DtkBuildConfig)
 set(options MSG) # print MODULE_NAME D_HEADERS DEST_DIR
-gen_dtk_config_header(MODULE_NAME ${LIB_NAME} HEADERS ${D_HEADERS})
+gen_dtk_config_header(MODULE_NAME ${LIB_NAME} HEADERS ${D_HEADERS} DEST_DIR ${CMAKE_CURRENT_LIST_DIR}/src OUTPUT_VARIABLE CONFIG_PATH)
+list(APPEND PUBLIC_HEADERS ${CONFIG_PATH})
 
 # Install library
 install(TARGETS ${LIB_NAME} EXPORT DtkDeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}")