Skip to content

Commit 1e1ff4e

Browse files
asterwyx18202781743
authored andcommitted
build: generate dtkcore_config.h out of source tree
Generate dtkcore_config.h in PROJECT_BINARY_DIR. Log: generate dtkcore_config.h out of source tree Influence: compilation with different API version.
1 parent d3b2ef9 commit 1e1ff4e

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

dtkcore.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION "${CMAKE_IN
138138
configure_file(misc/qt_lib_dtkcore.pri.in qt_lib_dtkcore.pri @ONLY)
139139
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt_lib_dtkcore.pri DESTINATION "${MKSPECS_INSTALL_DIR}")
140140
install(FILES misc/dtk_install_dconfig.prf DESTINATION ${FEATURES_INSTALL_DIR})
141-
set(CONFIGNAME include/global/dtkcore_config.h)
141+
set(CONFIGNAME ${PROJECT_BINARY_DIR}/dtkcore_config.h)
142142
file(WRITE ${CONFIGNAME}
143143
"// it is auto make config\n"
144144
"#define DTK_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}\n"
@@ -154,3 +154,4 @@ foreach(FILENAME ${CONFIGSOURCE})
154154
get_filename_component(thefile ${FILENAME} NAME)
155155
file(APPEND ${CONFIGNAME} "#define DTKCORE_CLASS_${thefile}\n")
156156
endforeach()
157+
install(FILES ${CONFIGNAME} DESTINATION "${INCLUDE_INSTALL_DIR}/DCore/global/")

src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ target_include_directories(${LIB_NAME} PUBLIC
144144
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/settings>
145145
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/filesystem>
146146
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
147+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
147148
)
148149

149150
target_include_directories(${LIB_NAME} INTERFACE

tools/ch2py/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ target_link_libraries(${BIN_NAME} PRIVATE
1414
Qt${QT_VERSION_MAJOR}::Core
1515
)
1616
target_include_directories(${BIN_NAME} PRIVATE
17-
${PROJECT_SOURCE_DIR}/include/util
18-
${PROJECT_SOURCE_DIR}/include/global
17+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/util>
18+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/global>
19+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
1920
)
2021
set_target_properties(${BIN_NAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
2122
install(TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR}")

tools/deepin-os-release/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ target_link_libraries(${BIN_NAME} PRIVATE
3131
Qt${QT_VERSION_MAJOR}::CorePrivate
3232
)
3333
target_include_directories(${BIN_NAME} PUBLIC
34-
../../include/
35-
../../include/dci/
36-
../../include/DtkCore/
37-
../../include/base/
38-
../../include/global/
34+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
35+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/dci>
36+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/DtkCore>
37+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/base>
38+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/global>
39+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
3940
)
4041
set_target_properties(${BIN_NAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
4142
install(TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR}")

0 commit comments

Comments
 (0)