6262 include (cmake/CPM.cmake )
6363 include (cmake/icons-breeze.cmake )
6464
65- CPMAddPackage ("gh:diegoiast/qmdilib#1cd56fd0a955ca59e86f4834f3019639f9c22808 " )
66- CPMAddPackage ("gh:diegoiast/qutepart-cpp#eec2e9ae5b50b591f017296ee743ee2860a280e4 " )
65+ CPMAddPackage ("gh:diegoiast/qmdilib#47737966ce1a45c23c51e78a2fa966cae6b88601 " )
66+ CPMAddPackage ("gh:diegoiast/qutepart-cpp#9767e876b2db17cacc9968065a3b2948b2094391 " )
6767 CPMAddPackage ("gh:diegoiast/command-palette-widget#69eb447b61c9d042394a1404c71a0d0b54ac28c0" )
6868 CPMAddPackage ("gh:diegoiast/KodoTerm#9d016815076a451ad639fa021d46602585e91247" )
6969 CPMAddPackage ("gh:palacaze/image-viewer#125ea784f93327b471cd9b6b156285e40e70280a" )
@@ -78,6 +78,11 @@ set(CMAKE_AUTOMOC ON)
7878set (CMAKE_AUTORCC ON )
7979set (CMAKE_AUTOUIC ON )
8080
81+ # FIXME: the plugin-demo framework (iplugin, pluginmanager, filesystembrowser)
82+ # should be a proper exported target inside qmdilib, not demo source files
83+ # compiled directly into consumers. Move them out of demos/ into qmdilib's
84+ # library so they can be consumed via target_link_libraries without needing
85+ # ${qmdilib_SOURCE_DIR}.
8186set (codepointer_sources
8287 ${qmdilib_SOURCE_DIR } /demos/common/common.qrc
8388 ${qmdilib_SOURCE_DIR } /demos/plugin-demo/iplugin.cpp
@@ -91,9 +96,6 @@ set(codepointer_sources
9196 ${qmdilib_SOURCE_DIR } /demos/plugin-demo/plugins/filesystem/filesystembrowser.h
9297 ${qmdilib_SOURCE_DIR } /demos/plugin-demo/plugins/filesystem/filesystemwidget.cpp
9398 ${qmdilib_SOURCE_DIR } /demos/plugin-demo/plugins/filesystem/filesystemwidget.h
94- ${qutepart_SOURCE_DIR } /qutepart-syntax-files.qrc
95- ${qutepart_SOURCE_DIR } /qutepart-theme-data.qrc
96-
9799 src/widgets/bannermessage.ui
98100 src/widgets/bannerwidget.cpp
99101 src/widgets/bannerwidget.h
@@ -226,9 +228,10 @@ else()
226228 target_compile_definitions (codepointer PRIVATE -DBUILD_OFFICIAL )
227229endif ()
228230
231+ # FIXME: ${qmdilib_SOURCE_DIR}/demos/plugin-demo should not be needed here.
232+ # Once the plugin-demo framework is a proper qmdilib target this line goes away.
229233target_include_directories (codepointer PUBLIC
230234 ${qmdilib_SOURCE_DIR } /demos/plugin-demo
231- ${qutepart_SOURCE_DIR } /include
232235 src/plugins/TreeSitter/tree-sitter/lib/include
233236 src
234237)
0 commit comments