diff --git a/dtkcore.cmake b/dtkcore.cmake index df7f7cfc..1c468d70 100644 --- a/dtkcore.cmake +++ b/dtkcore.cmake @@ -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" @@ -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/") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 52b1eec1..80dd6859 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -144,6 +144,7 @@ target_include_directories(${LIB_NAME} PUBLIC $ $ $ + $ ) target_include_directories(${LIB_NAME} INTERFACE diff --git a/tools/ch2py/CMakeLists.txt b/tools/ch2py/CMakeLists.txt index 599d180f..18f2e434 100644 --- a/tools/ch2py/CMakeLists.txt +++ b/tools/ch2py/CMakeLists.txt @@ -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 + $ + $ + $ ) set_target_properties(${BIN_NAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME}) install(TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR}") diff --git a/tools/deepin-os-release/CMakeLists.txt b/tools/deepin-os-release/CMakeLists.txt index 26cb8fc6..4cc96c3b 100644 --- a/tools/deepin-os-release/CMakeLists.txt +++ b/tools/deepin-os-release/CMakeLists.txt @@ -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/ + $ + $ + $ + $ + $ + $ ) set_target_properties(${BIN_NAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME}) install(TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR}")