Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dtkcore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION "${CMAKE_IN
configure_file(misc/qt_lib_dtkcore.pri.in qt_lib_dtkcore.pri @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt_lib_dtkcore.pri DESTINATION "${MKSPECS_INSTALL_DIR}")
install(FILES misc/dtk_install_dconfig.prf DESTINATION ${FEATURES_INSTALL_DIR})
set(CONFIGNAME include/global/dtkcore_config.h)
set(CONFIGNAME ${PROJECT_BINARY_DIR}/dtkcore_config.h)
file(WRITE ${CONFIGNAME}
"// it is auto make config\n"
"#define DTK_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}\n"
Expand All @@ -154,3 +154,4 @@ foreach(FILENAME ${CONFIGSOURCE})
get_filename_component(thefile ${FILENAME} NAME)
file(APPEND ${CONFIGNAME} "#define DTKCORE_CLASS_${thefile}\n")
endforeach()
install(FILES ${CONFIGNAME} DESTINATION "${INCLUDE_INSTALL_DIR}/DCore/global/")
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ target_include_directories(${LIB_NAME} PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/settings>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/filesystem>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
)

target_include_directories(${LIB_NAME} INTERFACE
Expand Down
5 changes: 3 additions & 2 deletions tools/ch2py/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ target_link_libraries(${BIN_NAME} PRIVATE
Qt${QT_VERSION_MAJOR}::Core
)
target_include_directories(${BIN_NAME} PRIVATE
${PROJECT_SOURCE_DIR}/include/util
${PROJECT_SOURCE_DIR}/include/global
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/util>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/global>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
)
set_target_properties(${BIN_NAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
install(TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR}")
11 changes: 6 additions & 5 deletions tools/deepin-os-release/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ target_link_libraries(${BIN_NAME} PRIVATE
Qt${QT_VERSION_MAJOR}::CorePrivate
)
target_include_directories(${BIN_NAME} PUBLIC
../../include/
../../include/dci/
../../include/DtkCore/
../../include/base/
../../include/global/
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/dci>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/DtkCore>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/base>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/global>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
)
set_target_properties(${BIN_NAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
install(TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR}")
Expand Down