File tree Expand file tree Collapse file tree 4 files changed +12
-8
lines changed
Expand file tree Collapse file tree 4 files changed +12
-8
lines changed Original file line number Diff line number Diff line change @@ -138,7 +138,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION "${CMAKE_IN
138138configure_file (misc/qt_lib_dtkcore.pri.in qt_lib_dtkcore.pri @ONLY)
139139install (FILES ${CMAKE_CURRENT_BINARY_DIR} /qt_lib_dtkcore.pri DESTINATION "${MKSPECS_INSTALL_DIR} " )
140140install (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)
142142file (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 " )
156156endforeach ()
157+ install (FILES ${CONFIGNAME} DESTINATION "${INCLUDE_INSTALL_DIR} /DCore/global/" )
Original file line number Diff line number Diff 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
149150target_include_directories (${LIB_NAME} INTERFACE
Original file line number Diff line number Diff line change @@ -14,8 +14,9 @@ target_link_libraries(${BIN_NAME} PRIVATE
1414 Qt${QT_VERSION_MAJOR} ::Core
1515)
1616target_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)
2021set_target_properties (${BIN_NAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME} )
2122install (TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR} " )
Original file line number Diff line number Diff line change @@ -31,11 +31,12 @@ target_link_libraries(${BIN_NAME} PRIVATE
3131 Qt${QT_VERSION_MAJOR} ::CorePrivate
3232)
3333target_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)
4041set_target_properties (${BIN_NAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME} )
4142install (TARGETS ${BIN_NAME} DESTINATION "${TOOL_INSTALL_DIR} " )
You can’t perform that action at this time.
0 commit comments