Commit 50fce0b2 authored by Daniel Mensinger's avatar Daniel Mensinger

Merge branch '5.4'

parents 4477cd51 647b19b8
Pipeline #5900 failed with stage
in 60 minutes
......@@ -75,6 +75,7 @@ endif()
ecm_optional_add_subdirectory(cmake)
ecm_optional_add_subdirectory(custommake)
ecm_optional_add_subdirectory(custom-buildsystem)
add_subdirectory(meson)
if (KDevelop-PG-Qt_FOUND)
ecm_optional_add_subdirectory(qmakemanager)
endif()
......@@ -131,7 +132,6 @@ add_subdirectory(standardoutputview)
add_subdirectory(switchtobuddy)
add_subdirectory(testview)
add_subdirectory(scratchpad)
add_subdirectory(meson)
ecm_optional_add_subdirectory(classbrowser)
ecm_optional_add_subdirectory(executeplasmoid)
ecm_optional_add_subdirectory(ghprovider)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment