From 4b7544d29b4f78af610c8b255ee6710bbf21fdcd Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 7 Sep 2015 13:18:01 +0300 Subject: [PATCH] kdevelop: fix bootstrapping and adjust to recent changes --- CMakeLists.txt | 6 +-- amarok/tests/CMakeLists.txt | 2 +- amarok/tests/browsers/CMakeLists.txt | 2 +- .../collections/db/sql/CMakeLists.txt | 2 +- .../collections/support/CMakeLists.txt | 2 +- amarok/tests/core-impl/logger/CMakeLists.txt | 2 +- .../tests/core-impl/meta/multi/CMakeLists.txt | 2 +- .../playlists/types/file/CMakeLists.txt | 8 ++-- amarok/tests/core-impl/support/CMakeLists.txt | 2 +- .../core/collections/support/CMakeLists.txt | 2 +- amarok/tests/core/playlists/CMakeLists.txt | 2 +- amarok/tests/dynamic/CMakeLists.txt | 2 +- amarok/tests/importers/CMakeLists.txt | 2 +- amarok/tests/scanner/CMakeLists.txt | 2 +- amarok/tests/services/amazon/CMakeLists.txt | 2 +- amarok/tests/synchronization/CMakeLists.txt | 6 +-- kdevelop/CHANGELOG.4.7.1 | 43 ------------------- kdevelop/CMakeLists.txt | 22 +++++++++- kdevelop/app/CMakeLists.txt | 33 +------------- kdevelop/app_templates/CMakeLists.txt | 1 + kdevelop/debuggers/gdb/CMakeLists.txt | 30 +++++-------- .../debuggers/gdb/printers/CMakeLists.txt | 4 +- kdevelop/debuggers/gdb/selectcoredialog.cpp | 2 + kdevelop/documentation/qthelp/CMakeLists.txt | 9 ++-- kdevelop/formatters/astyle/CMakeLists.txt | 8 ++-- .../executeplasmoid/CMakeLists.txt | 6 +-- .../executeplasmoid/executeplasmoidplugin.cpp | 1 + .../plasmoidexecutionconfig.cpp | 1 + .../kdeintegration/kdeprovider/CMakeLists.txt | 6 ++- kdevelop/languages/cpp/CMakeLists.txt | 15 +++---- .../cpp/codegen/{ui => }/cppnewclass.ui | 0 .../codegen/{ui => }/cppoverridebuttons.ui | 0 .../codegen/{ui => }/custom_include_paths.ui | 0 .../codegen/{ui => }/privateimplementation.ui | 0 .../codegen/unresolvedincludeassistant.cpp | 1 + .../languages/cpp/cppduchain/CMakeLists.txt | 4 +- kdevelop/languages/cpp/parser/CMakeLists.txt | 4 +- .../languages/cpp/parser/rpp/CMakeLists.txt | 5 ++- .../cpp/parser/rpp/tests/CMakeLists.txt | 8 ++-- .../languages/cpp/parser/tests/CMakeLists.txt | 14 +++--- kdevelop/languages/cpp/tests/CMakeLists.txt | 4 +- .../custom-definesandincludes/CMakeLists.txt | 12 +++--- .../compilerprovider/CMakeLists.txt | 4 +- .../kcm_widget/CMakeLists.txt | 3 -- .../kcm_widget/compilerswidget.cpp | 1 + .../kcm_widget/defineswidget.cpp | 1 + .../kcm_widget/includeswidget.cpp | 1 + .../cmakebuilder/CMakeLists.txt | 7 +-- .../makebuilder/CMakeLists.txt | 7 --- .../ninjabuilder/CMakeLists.txt | 10 ++--- kdevelop/projectmanagers/cmake/CMakeLists.txt | 19 ++------ .../cmake/cmakebuilddirchooser.cpp | 1 + .../cmake/settings/cmakepreferences.cpp | 1 + .../custom-buildsystem/CMakeLists.txt | 12 +++--- .../custom-buildsystem/configwidget.cpp | 1 + .../custombuildsystemconfigwidget.cpp | 4 +- kdevplatform/CMakeLists.txt | 3 -- 57 files changed, 143 insertions(+), 211 deletions(-) delete mode 100644 kdevelop/CHANGELOG.4.7.1 rename kdevelop/languages/cpp/codegen/{ui => }/cppnewclass.ui (100%) rename kdevelop/languages/cpp/codegen/{ui => }/cppoverridebuttons.ui (100%) rename kdevelop/languages/cpp/codegen/{ui => }/custom_include_paths.ui (100%) rename kdevelop/languages/cpp/codegen/{ui => }/privateimplementation.ui (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bd9a1fb..37a5008a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,9 +61,9 @@ macro_optional_add_subdirectory (skanlite) macro_optional_add_subdirectory (svgpart) macro_optional_add_subdirectory (thumbnailers) macro_optional_add_subdirectory (yakuake) -# FIXME: half of the tests of kdevplatform are noop +# FIXME: tests for those bellow are broken +set(ENABLE_TESTING OFF) macro_optional_add_subdirectory (kdevplatform) -# FIXME: bootstrap fails because of kdevplatform not being found -# macro_optional_add_subdirectory (kdevelop) +macro_optional_add_subdirectory (kdevelop) macro_display_feature_log() diff --git a/amarok/tests/CMakeLists.txt b/amarok/tests/CMakeLists.txt index 259abbca..dbe1d837 100644 --- a/amarok/tests/CMakeLists.txt +++ b/amarok/tests/CMakeLists.txt @@ -78,7 +78,7 @@ target_link_libraries(testdebug ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} amarok set( testenginecontroller_SRCS TestEngineController.cpp ) kde4_add_unit_test( testenginecontroller ${testenginecontroller_SRCS} ) -target_link_libraries( testenginecontroller ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} amaroklib amarokcore ) +target_link_libraries( testenginecontroller ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} amaroklib amarokcore ) #------------------------ Test Expression ----------------------------- diff --git a/amarok/tests/browsers/CMakeLists.txt b/amarok/tests/browsers/CMakeLists.txt index d298c0c9..3a7f773d 100644 --- a/amarok/tests/browsers/CMakeLists.txt +++ b/amarok/tests/browsers/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(testsinglecollectiontreeitemmodel ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${GOOGLEMOCK_LIBRARIES}) diff --git a/amarok/tests/core-impl/collections/db/sql/CMakeLists.txt b/amarok/tests/core-impl/collections/db/sql/CMakeLists.txt index 213b11da..89a1f679 100644 --- a/amarok/tests/core-impl/collections/db/sql/CMakeLists.txt +++ b/amarok/tests/core-impl/collections/db/sql/CMakeLists.txt @@ -36,7 +36,7 @@ macro(add_database_test test_target test_sources) amarok-sqlcollection ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} diff --git a/amarok/tests/core-impl/collections/support/CMakeLists.txt b/amarok/tests/core-impl/collections/support/CMakeLists.txt index 7bc05c5a..a023acc9 100644 --- a/amarok/tests/core-impl/collections/support/CMakeLists.txt +++ b/amarok/tests/core-impl/collections/support/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(testmemoryquerymaker amaroklib ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${GOOGLEMOCK_LIBRARIES}) diff --git a/amarok/tests/core-impl/logger/CMakeLists.txt b/amarok/tests/core-impl/logger/CMakeLists.txt index ed0051f1..3d04c5ce 100644 --- a/amarok/tests/core-impl/logger/CMakeLists.txt +++ b/amarok/tests/core-impl/logger/CMakeLists.txt @@ -27,6 +27,6 @@ target_link_libraries( testproxylogger ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${GOOGLEMOCK_LIBRARIES} ${CMAKE_DL_LIBS}) diff --git a/amarok/tests/core-impl/meta/multi/CMakeLists.txt b/amarok/tests/core-impl/meta/multi/CMakeLists.txt index baa3c903..61babf51 100644 --- a/amarok/tests/core-impl/meta/multi/CMakeLists.txt +++ b/amarok/tests/core-impl/meta/multi/CMakeLists.txt @@ -39,7 +39,7 @@ target_link_libraries( testmetamultitrack ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${KDE4_SOLID_LIBS} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${GOOGLEMOCK_LIBRARIES} diff --git a/amarok/tests/core-impl/playlists/types/file/CMakeLists.txt b/amarok/tests/core-impl/playlists/types/file/CMakeLists.txt index 96bbd7bd..c3c82fcf 100644 --- a/amarok/tests/core-impl/playlists/types/file/CMakeLists.txt +++ b/amarok/tests/core-impl/playlists/types/file/CMakeLists.txt @@ -9,25 +9,25 @@ include_directories( . set( testasxplaylist_SRCS asx/TestASXPlaylist.cpp ) kde4_add_unit_test( testasxplaylist ${testasxplaylist_SRCS} ) -target_link_libraries( testasxplaylist ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib ) +target_link_libraries( testasxplaylist ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib ) #------------------------ Test M3UPlaylist ----------------------------- set( testm3uplaylist_SRCS m3u/TestM3UPlaylist.cpp ) kde4_add_unit_test( testm3uplaylist ${testm3uplaylist_SRCS} ) -target_link_libraries( testm3uplaylist ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib ) +target_link_libraries( testm3uplaylist ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib ) #------------------------ Test PLSPlaylist ----------------------------- set( testplsplaylist_SRCS pls/TestPLSPlaylist.cpp ) kde4_add_unit_test( testplsplaylist ${testplsplaylist_SRCS} ) -target_link_libraries( testplsplaylist ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) +target_link_libraries( testplsplaylist ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) #------------------------ Test XSPFPLAYLIST ----------------------------- set( testxspfplaylist_SRCS xspf/TestXSPFPlaylist.cpp ) kde4_add_unit_test( testxspfplaylist ${testxspfplaylist_SRCS} ) -target_link_libraries( testxspfplaylist ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) +target_link_libraries( testxspfplaylist ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) #------------------------ Test PlaylistFileSupport ----------------------------- diff --git a/amarok/tests/core-impl/support/CMakeLists.txt b/amarok/tests/core-impl/support/CMakeLists.txt index 71303e36..93ee3f48 100644 --- a/amarok/tests/core-impl/support/CMakeLists.txt +++ b/amarok/tests/core-impl/support/CMakeLists.txt @@ -8,5 +8,5 @@ target_link_libraries( testtrackloader ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ) diff --git a/amarok/tests/core/collections/support/CMakeLists.txt b/amarok/tests/core/collections/support/CMakeLists.txt index f2dcd239..cd87fad4 100644 --- a/amarok/tests/core/collections/support/CMakeLists.txt +++ b/amarok/tests/core/collections/support/CMakeLists.txt @@ -7,4 +7,4 @@ include_directories( . set( testtrackforurlworker_SRCS TestTrackForUrlWorker.cpp ../../../mocks/MockTrackForUrlWorker.cpp ) kde4_add_unit_test( testtrackforurlworker ${testtrackforurlworker_SRCS} ) -target_link_libraries( testtrackforurlworker ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES} amarokcore amaroklib ) +target_link_libraries( testtrackforurlworker ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${KDE4_THREADWEAVER_LIBS} amarokcore amaroklib ) diff --git a/amarok/tests/core/playlists/CMakeLists.txt b/amarok/tests/core/playlists/CMakeLists.txt index ede5979c..43217901 100644 --- a/amarok/tests/core/playlists/CMakeLists.txt +++ b/amarok/tests/core/playlists/CMakeLists.txt @@ -16,4 +16,4 @@ set( testplaylistobserver_SRCS ${AMAROK_SOURCE_TREE}/core/playlists/Playlist.cpp ) kde4_add_unit_test( testplaylistobserver ${testplaylistobserver_SRCS} ) -target_link_libraries( testplaylistobserver ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) +target_link_libraries( testplaylistobserver ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) diff --git a/amarok/tests/dynamic/CMakeLists.txt b/amarok/tests/dynamic/CMakeLists.txt index 3a9f1a0d..c169732f 100644 --- a/amarok/tests/dynamic/CMakeLists.txt +++ b/amarok/tests/dynamic/CMakeLists.txt @@ -15,7 +15,7 @@ macro(link_database_test test_target) amaroklib ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} diff --git a/amarok/tests/importers/CMakeLists.txt b/amarok/tests/importers/CMakeLists.txt index d36a8ada..50c80821 100644 --- a/amarok/tests/importers/CMakeLists.txt +++ b/amarok/tests/importers/CMakeLists.txt @@ -8,7 +8,7 @@ set( testimporterscommon_LIBS amarokcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${QT_QTSQL_LIBRARY} ${QT_QTTEST_LIBRARY} ${GOOGLEMOCK_LIBRARIES} diff --git a/amarok/tests/scanner/CMakeLists.txt b/amarok/tests/scanner/CMakeLists.txt index b5eacbf4..347b5e2c 100644 --- a/amarok/tests/scanner/CMakeLists.txt +++ b/amarok/tests/scanner/CMakeLists.txt @@ -26,7 +26,7 @@ macro(add_database_test test_target test_sources) amarokshared ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} diff --git a/amarok/tests/services/amazon/CMakeLists.txt b/amarok/tests/services/amazon/CMakeLists.txt index 6e0054dd..02d53b68 100644 --- a/amarok/tests/services/amazon/CMakeLists.txt +++ b/amarok/tests/services/amazon/CMakeLists.txt @@ -146,7 +146,7 @@ kde4_add_unit_test( testamazonparser ${testamazonparser_SRCS} ) target_link_libraries( testamazonparser ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} -${KDE4_THREADWEAVER_LIBRARIES} +${KDE4_THREADWEAVER_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} diff --git a/amarok/tests/synchronization/CMakeLists.txt b/amarok/tests/synchronization/CMakeLists.txt index f1731ebf..4a2ec93b 100644 --- a/amarok/tests/synchronization/CMakeLists.txt +++ b/amarok/tests/synchronization/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(testmasterslavesynchronizationjob ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBRARY} ${QT_QTGUI_LIBRARY} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${GOOGLEMOCK_LIBRARIES}) @@ -56,7 +56,7 @@ target_link_libraries(testunionjob ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBRARY} ${QT_QTGUI_LIBRARY} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${GOOGLEMOCK_LIBRARIES}) @@ -82,7 +82,7 @@ target_link_libraries(testonewaysynchronizationjob ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBRARY} ${QT_QTGUI_LIBRARY} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${GOOGLEMOCK_LIBRARIES}) diff --git a/kdevelop/CHANGELOG.4.7.1 b/kdevelop/CHANGELOG.4.7.1 deleted file mode 100644 index 86a9f93c..00000000 --- a/kdevelop/CHANGELOG.4.7.1 +++ /dev/null @@ -1,43 +0,0 @@ -ChangeLog for kdevelop v4.7.1 -============================= - -* Milian Wolff: Prepare release of 4.7.1 -* Kevin Funk: Fix CMakePreferences sizing -* Kevin Funk: cpp: Fix conversion warnings -* Kevin Funk: PVS V555 fix -* Kevin Funk: includeswidget: Use KMessageWidget -* Kevin Funk: Lower-case project name -* René J.V. Bertin: Avoid setting CMake variables globally that also exist as target-specific. -* René J.V. Bertin: OS X: * additional protection against App Nap and automaticTermination * really set the BundleDisplayName * generate an application icon resource -* René J.V. Bertin: [OS X] Set the Info.plist bundle name to KDevelop and the Info String to the longer string. Also disable support for automatic termination in the Info.plist. -* Kevin Funk: mac: Use correct bundle version -* HuiJie Zhang: Fix bug on multi-line function-macros expansion, -* Milian Wolff: Delete some dead code -* René J.V. Bertin: fix indentation REVIEW: 121391 -* René J.V. Bertin: [OS X] create a dedicated Info.plist for kdevelop REVIEW: 121394 -* René J.V. Bertin: Avoid inappropriate warning about faulty ninja.build file from gdb/CMakeLists.txt REVIEW: 121391 -* Kevin Funk: Hack for making build with CMake 2.8 and Ninja -* Kevin Funk: Remove .kdev4 file from subdirectory -* Kevin Funk: Revert "MissingDeclarationAssistant: Only show identifier" -* Kevin Funk: Disable missing decl assistant for namespaced ids -* Kevin Funk: Fix test in combination with GCC 4.9.1 and -O2 -* Kevin Funk: Don't access dangling pointer -* Nicolas Werner: Fix environment-cd for paths containing spaces. -* Kevin Funk: Make compile for me -* Milian Wolff: Reduce QVariant usage. -* Milian Wolff: Fix regressions introduced by recent refactoring. -* Milian Wolff: Minor code cleanup -* Milian Wolff: Use the add_debuggable_executable macro everywhere its required. -* Milian Wolff: Revert "Use debugfull configuration whenever it is available." -* Milian Wolff: Use debugfull configuration whenever it is available. -* Milian Wolff: Refactor the custom defines and includes plugin. -* Milian Wolff: Fix regression: Don't remove the KDEV_USE_EXTENSION_INTERFACE. -* Milian Wolff: Fix assertion about unknown projects in the IDAIM. -* Aleix Pol: Change precedence of default include paths -* Milian Wolff: Fixup signal connection -* Milian Wolff: Fix compile with clang 3.5 -* Pino Toscano: gdb: "#else if" does not exist, "#elif" does -* Pino Toscano: gdb: fix member order -* Pino Toscano: fix ByteArray/QByteArray typo -* René J.V. Bertin: Enables the debugger on OS X. Requires presence of a recent gdb version, e.g. from MacPorts. REVIEW: 120510 -* Kevin Funk: Fix uninitialized member 'kind' diff --git a/kdevelop/CMakeLists.txt b/kdevelop/CMakeLists.txt index 0dda977b..8389b765 100644 --- a/kdevelop/CMakeLists.txt +++ b/kdevelop/CMakeLists.txt @@ -37,7 +37,27 @@ if("${_isSystemLibDir}" STREQUAL "-1") endif("${_isSystemLibDir}" STREQUAL "-1") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -find_package(KDevPlatform REQUIRED) +if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) + find_package(kdevplatform REQUIRED) +else() + set(KDEVPLATFORM_INCLUDE_DIR + ${CMAKE_SOURCE_DIR}/kdevplatform + ${CMAKE_SOURCE_DIR}/kdevplatform/plugins + ${CMAKE_BINARY_DIR}/kdevplatform + ) + set(KDEVPLATFORM_INTERFACES_LIBRARIES kdevplatforminterfaces) + set(KDEVPLATFORM_SHELL_LIBRARIES kdevplatformshell) + set(KDEVPLATFORM_UTIL_LIBRARIES kdevplatformutil) + set(KDEVPLATFORM_LANGUAGE_LIBRARIES kdevplatformlanguage) + set(KDEVPLATFORM_DOCUMENTATION_LIBRARIES kdevplatformdocumentation) + set(KDEVPLATFORM_DEBUGGER_LIBRARIES kdevplatformdebugger) + set(KDEVPLATFORM_TESTS_LIBRARIES kdevplatformtests) + set(KDEVPLATFORM_JSONTESTS_LIBRARIES kdevplatformjsontests) + set(KDEVPLATFORM_PROJECT_LIBRARIES kdevplatformproject) + set(KDEVPLATFORM_VCS_LIBRARIES kdevplatformvcs) + set(KDEVPLATFORM_OUTPUTVIEW_LIBRARIES kdevplatformoutputview) + set(KDEVPLATFORM_SUBLIME_LIBRARIES sublime) +endif() include_directories(${KDEVPLATFORM_INCLUDE_DIR}) diff --git a/kdevelop/app/CMakeLists.txt b/kdevelop/app/CMakeLists.txt index 6133b5f0..dd4e742a 100644 --- a/kdevelop/app/CMakeLists.txt +++ b/kdevelop/app/CMakeLists.txt @@ -10,13 +10,8 @@ if(KDECLARATIVE_FOUND) set(kdevelop_SRCS ${kdevelop_SRCS} welcomepage/sessionsmodel.cpp welcomepage/welcomepageview.cpp welcomepage/uihelper.cpp) add_definitions(-DWITH_WELCOMEPAGE) - qt4_add_resources(kdevelop_SRCS welcomepage/welcomepage.qrc) + qt4_add_resources(kdevelop_SRCS welcomepage/welcomepage.qrc) endif(KDECLARATIVE_FOUND) -if(APPLE) - kde4_add_app_icon(kdevelop_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/kdevelop.png") -else() - kde4_add_app_icon(kdevelop_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png") -endif(APPLE) add_executable(kdevelop ${kdevelop_SRCS} ) @@ -29,7 +24,7 @@ target_link_libraries(kdevelop ${KDE4_KPARTS_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KTEXTEDITOR_LIBS} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${QT_QTDECLARATIVE_LIBRARIES} ) @@ -41,30 +36,6 @@ install(TARGETS kdevelop ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES kdevelop! DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) -if(APPLE) - kde4_add_app_icon(kdevelop_bin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/kdevelop.png") -else() - kde4_add_app_icon(kdevelop_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png") -endif(APPLE) - -if (APPLE) - # the MacOSX bundle display name property (CFBundleDisplayName) is not currently supported by cmake, - # so has to be set for all targets in this cmake file - set(MACOSX_BUNDLE_DISPLAY_NAME KDevelop) - # We provide our own Info.plist to disable AppNap for KDevelop: - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in) - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.KDevelop") - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDevelop") - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "KDevelop") - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_STRING "The KDevelop Integrated Development Environment") - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "KDevelop ${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}") - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}") - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}") - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_ICON_FILE "kdevelop_SRCS.icns") - set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_COPYRIGHT "KDevelop Team") -endif (APPLE) - - ########### install files ############### install( PROGRAMS kdevelop.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) diff --git a/kdevelop/app_templates/CMakeLists.txt b/kdevelop/app_templates/CMakeLists.txt index 2fa61b2f..6fcee43d 100644 --- a/kdevelop/app_templates/CMakeLists.txt +++ b/kdevelop/app_templates/CMakeLists.txt @@ -5,4 +5,5 @@ set(apptemplate_DIRS cpp/CMake/cmake_plaincpp ) +include(${CMAKE_SOURCE_DIR}/kdevplatform/cmake/modules/KDevPlatformMacros.cmake) kdevplatform_add_app_templates(${apptemplate_DIRS}) diff --git a/kdevelop/debuggers/gdb/CMakeLists.txt b/kdevelop/debuggers/gdb/CMakeLists.txt index 52662d81..a44b8a40 100644 --- a/kdevelop/debuggers/gdb/CMakeLists.txt +++ b/kdevelop/debuggers/gdb/CMakeLists.txt @@ -12,14 +12,12 @@ function(add_debuggable_executable target) set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} ${_flags}") endfunction() -if(NOT APPLE) macro_optional_find_package(KDE4Workspace) macro_log_feature( KDE4WORKSPACE_FOUND "KDE 4 Workspace" "KDE 4 Workspace libraries" "kdebase/workspace" FALSE "" "Required for building the process selection dialog for attaching GDB to a running process." ) -endif(NOT APPLE) if(KDE4WORKSPACE_FOUND) include_directories( @@ -41,9 +39,7 @@ add_subdirectory(printers) add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9012 ) -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) #add_subdirectory(tests) @@ -81,6 +77,11 @@ set(kdevgdb_PART_SRCS registers/registercontroller_arm.cpp registers/modelsmanager.cpp registers/converters.cpp + debuggertracingdialog.ui + debuggerconfigwidget.ui + selectcore.ui + selectaddress.ui + registers/registersview.ui ) if(KDE4WORKSPACE_FOUND) @@ -90,15 +91,6 @@ if(KDE4WORKSPACE_FOUND) ) endif(KDE4WORKSPACE_FOUND) -set(kdevgdb_PART_UI - debuggertracingdialog.ui - debuggerconfigwidget.ui - selectcore.ui - selectaddress.ui - registers/registersview.ui -) - -kde4_add_ui_files(kdevgdb_PART_SRCS ${kdevgdb_PART_UI}) kde4_add_plugin(kdevgdb ${kdevgdb_PART_SRCS}) target_link_libraries(kdevgdb ${KDEVPLATFORM_SUBLIME_LIBRARIES} ${KDEVPLATFORM_INTERFACES_LIBRARIES} @@ -144,6 +136,9 @@ set(gdbtest_PART_SRCS registers/registercontroller_arm.cpp registers/modelsmanager.cpp registers/converters.cpp + debuggertracingdialog.ui + selectaddress.ui + registers/registersview.ui ) if(KDE4WORKSPACE_FOUND) @@ -153,12 +148,7 @@ if(KDE4WORKSPACE_FOUND) ) endif(KDE4WORKSPACE_FOUND) -kde4_add_ui_files(gdbtest_PART_SRCS - debuggertracingdialog.ui - selectaddress.ui - registers/registersview.ui -) -kde4_add_unit_test(gdbtest ${gdbtest_PART_SRCS}) +kde4_add_test(gdbtest ${gdbtest_PART_SRCS}) target_link_libraries(gdbtest ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_SHELL_LIBRARIES} diff --git a/kdevelop/debuggers/gdb/printers/CMakeLists.txt b/kdevelop/debuggers/gdb/printers/CMakeLists.txt index f772c8ad..891ddd42 100644 --- a/kdevelop/debuggers/gdb/printers/CMakeLists.txt +++ b/kdevelop/debuggers/gdb/printers/CMakeLists.txt @@ -1,4 +1,6 @@ -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() configure_file( gdbinit ${CMAKE_CURRENT_BINARY_DIR}/gdbinit ) diff --git a/kdevelop/debuggers/gdb/selectcoredialog.cpp b/kdevelop/debuggers/gdb/selectcoredialog.cpp index 7298682a..473456b9 100644 --- a/kdevelop/debuggers/gdb/selectcoredialog.cpp +++ b/kdevelop/debuggers/gdb/selectcoredialog.cpp @@ -19,6 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + #include "selectcoredialog.h" namespace GDBDebugger { diff --git a/kdevelop/documentation/qthelp/CMakeLists.txt b/kdevelop/documentation/qthelp/CMakeLists.txt index d99193eb..c0b1c929 100644 --- a/kdevelop/documentation/qthelp/CMakeLists.txt +++ b/kdevelop/documentation/qthelp/CMakeLists.txt @@ -1,5 +1,9 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9045 ) -add_subdirectory(tests) + +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() + set(kdevqthelp_SRCS qthelpplugin.cpp qthelpproviderabstract.cpp @@ -24,9 +28,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevqthelp.desktop DESTINATION ${SERVI set(kdevqthelp_config_SRCS qthelpconfig.cpp qthelp_config_shared.cpp -) - -kde4_add_ui_files(kdevqthelp_config_SRCS qthelpconfig.ui qthelpconfigeditdialog.ui ) diff --git a/kdevelop/formatters/astyle/CMakeLists.txt b/kdevelop/formatters/astyle/CMakeLists.txt index 6a443a8e..4ca48933 100644 --- a/kdevelop/formatters/astyle/CMakeLists.txt +++ b/kdevelop/formatters/astyle/CMakeLists.txt @@ -9,13 +9,9 @@ set(kdevastyle_PART_SRCS lib/ASEnhancer.cpp lib/ASFormatter.cpp lib/ASResource.cpp -) - -set(astyle_preferences_UI astyle_preferences.ui ) -kde4_add_ui_files(kdevastyle_PART_SRCS ${astyle_preferences_UI} ) kde4_add_plugin(kdevastyle ${kdevastyle_PART_SRCS}) target_link_libraries(kdevastyle ${KDE4_KDECORE_LIBS} @@ -32,4 +28,6 @@ install(TARGETS kdevastyle DESTINATION ${PLUGIN_INSTALL_DIR} ) configure_file(kdevastyle.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevastyle.desktop) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdevelop/kdeintegration/executeplasmoid/CMakeLists.txt b/kdevelop/kdeintegration/executeplasmoid/CMakeLists.txt index 5fefd9f2..2760d880 100644 --- a/kdevelop/kdeintegration/executeplasmoid/CMakeLists.txt +++ b/kdevelop/kdeintegration/executeplasmoid/CMakeLists.txt @@ -11,17 +11,13 @@ include_directories( ########### next target ############### -set(kdevexecuteplasmoid_PART_UIS - plasmoidexecutionconfig.ui -) - set(kdevexecuteplasmoid_PART_SRCS executeplasmoidplugin.cpp plasmoidexecutionconfig.cpp plasmoidexecutionjob.cpp + plasmoidexecutionconfig.ui ) -kde4_add_ui_files( kdevexecuteplasmoid_PART_SRCS ${kdevexecuteplasmoid_PART_UIS} ) kde4_add_plugin(kdevexecuteplasmoid ${kdevexecuteplasmoid_PART_SRCS} ) target_link_libraries(kdevexecuteplasmoid ${KDE4_KDEUI_LIBS} diff --git a/kdevelop/kdeintegration/executeplasmoid/executeplasmoidplugin.cpp b/kdevelop/kdeintegration/executeplasmoid/executeplasmoidplugin.cpp index a0891d4c..1070a303 100644 --- a/kdevelop/kdeintegration/executeplasmoid/executeplasmoidplugin.cpp +++ b/kdevelop/kdeintegration/executeplasmoid/executeplasmoidplugin.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include using namespace KDevelop; diff --git a/kdevelop/kdeintegration/executeplasmoid/plasmoidexecutionconfig.cpp b/kdevelop/kdeintegration/executeplasmoid/plasmoidexecutionconfig.cpp index 9d5b5fde..830deafa 100644 --- a/kdevelop/kdeintegration/executeplasmoid/plasmoidexecutionconfig.cpp +++ b/kdevelop/kdeintegration/executeplasmoid/plasmoidexecutionconfig.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/kdevelop/kdeintegration/kdeprovider/CMakeLists.txt b/kdevelop/kdeintegration/kdeprovider/CMakeLists.txt index 2aec9b0f..39465ea6 100644 --- a/kdevelop/kdeintegration/kdeprovider/CMakeLists.txt +++ b/kdevelop/kdeintegration/kdeprovider/CMakeLists.txt @@ -1,13 +1,15 @@ -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set(kdevkdeprovider_PART_SRCS kdeprojectsmodel.cpp kdeproviderwidget.cpp kdeproviderplugin.cpp kdeprojectsmodel.cpp kdeprojectsreader.cpp + kdeconfig.ui ) kde4_add_kcfg_files(kdevkdeprovider_PART_SRCS kdeconfig.kcfgc) -kde4_add_ui_files(kdevkdeprovider_PART_SRCS kdeconfig.ui) kde4_add_plugin(kdevkdeprovider ${kdevkdeprovider_PART_SRCS}) target_link_libraries(kdevkdeprovider ${KDE4_KDEUI_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_VCS_LIBRARIES}) diff --git a/kdevelop/languages/cpp/CMakeLists.txt b/kdevelop/languages/cpp/CMakeLists.txt index 644db914..d127ea40 100644 --- a/kdevelop/languages/cpp/CMakeLists.txt +++ b/kdevelop/languages/cpp/CMakeLists.txt @@ -10,7 +10,10 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9007 ) add_subdirectory(parser) add_subdirectory(cppduchain) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() + ########### next target ############### set(kdevcpplanguagesupport_PART_SRCS @@ -40,15 +43,11 @@ set(kdevcpplanguagesupport_PART_SRCS codegen/customincludepaths.cpp codegen/cppclasshelper.cpp # codegen/makeimplementationprivate.cpp -) -set(kdevcpplanguagesupport_LIB_UI - codegen/ui/custom_include_paths.ui -# codegen/ui/privateimplementation.ui + codegen/custom_include_paths.ui +# codegen/privateimplementation.ui ) -kde4_add_ui_files(kdevcpplanguagesupport_PART_SRCS ${kdevcpplanguagesupport_LIB_UI}) - option(BUILD_kdev_includepathresolver "Build the includepath resolver debugging tool" OFF) if(BUILD_kdev_includepathresolver) add_executable(kdev_includepathresolver includepathresolver.cpp) @@ -73,7 +72,7 @@ target_link_libraries(kdevcpplanguagesupport ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ) diff --git a/kdevelop/languages/cpp/codegen/ui/cppnewclass.ui b/kdevelop/languages/cpp/codegen/cppnewclass.ui similarity index 100% rename from kdevelop/languages/cpp/codegen/ui/cppnewclass.ui rename to kdevelop/languages/cpp/codegen/cppnewclass.ui diff --git a/kdevelop/languages/cpp/codegen/ui/cppoverridebuttons.ui b/kdevelop/languages/cpp/codegen/cppoverridebuttons.ui similarity index 100% rename from kdevelop/languages/cpp/codegen/ui/cppoverridebuttons.ui rename to kdevelop/languages/cpp/codegen/cppoverridebuttons.ui diff --git a/kdevelop/languages/cpp/codegen/ui/custom_include_paths.ui b/kdevelop/languages/cpp/codegen/custom_include_paths.ui similarity index 100% rename from kdevelop/languages/cpp/codegen/ui/custom_include_paths.ui rename to kdevelop/languages/cpp/codegen/custom_include_paths.ui diff --git a/kdevelop/languages/cpp/codegen/ui/privateimplementation.ui b/kdevelop/languages/cpp/codegen/privateimplementation.ui similarity index 100% rename from kdevelop/languages/cpp/codegen/ui/privateimplementation.ui rename to kdevelop/languages/cpp/codegen/privateimplementation.ui diff --git a/kdevelop/languages/cpp/codegen/unresolvedincludeassistant.cpp b/kdevelop/languages/cpp/codegen/unresolvedincludeassistant.cpp index 7c3bc49f..959892dc 100644 --- a/kdevelop/languages/cpp/codegen/unresolvedincludeassistant.cpp +++ b/kdevelop/languages/cpp/codegen/unresolvedincludeassistant.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/kdevelop/languages/cpp/cppduchain/CMakeLists.txt b/kdevelop/languages/cpp/cppduchain/CMakeLists.txt index 2944b3ac..e057e761 100644 --- a/kdevelop/languages/cpp/cppduchain/CMakeLists.txt +++ b/kdevelop/languages/cpp/cppduchain/CMakeLists.txt @@ -4,7 +4,9 @@ remove_definitions( -DKDE_DEFAULT_DEBUG_AREA=9007 ) add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9041 ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() include_directories( ${cpp_SOURCE_DIR} diff --git a/kdevelop/languages/cpp/parser/CMakeLists.txt b/kdevelop/languages/cpp/parser/CMakeLists.txt index c1ecfb21..0c9ada56 100644 --- a/kdevelop/languages/cpp/parser/CMakeLists.txt +++ b/kdevelop/languages/cpp/parser/CMakeLists.txt @@ -4,7 +4,9 @@ remove_definitions( -DKDE_DEFAULT_DEBUG_AREA=9007 ) add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9040 ) add_subdirectory(rpp) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() #add_subdirectory(headergen) ########### next target ############### diff --git a/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt b/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt index 7e08a578..e08e3cc1 100644 --- a/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt +++ b/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt @@ -1,4 +1,7 @@ -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() + ########### next target ############### diff --git a/kdevelop/languages/cpp/parser/rpp/tests/CMakeLists.txt b/kdevelop/languages/cpp/parser/rpp/tests/CMakeLists.txt index c08e526d..eb58ee3d 100644 --- a/kdevelop/languages/cpp/parser/rpp/tests/CMakeLists.txt +++ b/kdevelop/languages/cpp/parser/rpp/tests/CMakeLists.txt @@ -1,5 +1,7 @@ -set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) -include_directories( ${KDevelop_SOURCE_DIR}/languages/cpp/parser ${CMAKE_CURRENT_SOURCE_DIR}/.. ) +include_directories( + ${KDevelop_SOURCE_DIR}/languages/cpp/parser + ${CMAKE_CURRENT_SOURCE_DIR}/.. +) ########### next target ############### @@ -8,6 +10,6 @@ set(pp_SRCS main.cpp ) -add_executable(pp TEST ${pp_SRCS}) +kde4_add_manual_test(pp ${pp_SRCS}) target_link_libraries(pp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4cpprpp) diff --git a/kdevelop/languages/cpp/parser/tests/CMakeLists.txt b/kdevelop/languages/cpp/parser/tests/CMakeLists.txt index b16077a2..0eb9f107 100644 --- a/kdevelop/languages/cpp/parser/tests/CMakeLists.txt +++ b/kdevelop/languages/cpp/parser/tests/CMakeLists.txt @@ -1,14 +1,14 @@ - -set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/testconfig.h) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/testconfig.h +) ########### next target ############### set(parsertest_SRCS test_parser.cpp test_parser_cpp2011.cpp) - -kde4_add_unit_test(parsertest ${parsertest_SRCS}) +kde4_add_test(parsertest ${parsertest_SRCS}) target_link_libraries(parsertest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_TESTS_LIBRARIES} kdev4cpprpp kdev4cppparser) @@ -17,7 +17,7 @@ target_link_libraries(parsertest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} $ set(generatortest_SRCS test_generator.cpp) -kde4_add_unit_test(generatortest ${generatortest_SRCS}) +kde4_add_test(generatortest ${generatortest_SRCS}) target_link_libraries(generatortest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} kdev4cpprpp kdev4cppparser) @@ -26,7 +26,7 @@ target_link_libraries(generatortest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS set(pooltest_SRCS test_pool.cpp) -kde4_add_unit_test(pooltest ${pooltest_SRCS}) +kde4_add_test(pooltest ${pooltest_SRCS}) target_link_libraries(pooltest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTTEST_LIBRARY} kdev4cppparser) diff --git a/kdevelop/languages/cpp/tests/CMakeLists.txt b/kdevelop/languages/cpp/tests/CMakeLists.txt index 14c8d2f9..4d6a21e7 100644 --- a/kdevelop/languages/cpp/tests/CMakeLists.txt +++ b/kdevelop/languages/cpp/tests/CMakeLists.txt @@ -105,7 +105,7 @@ target_link_libraries(cppassistantstest ${QT_QTTEST_LIBRARY} kdev4cppparser ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDE4_KDECORE_LIBS} @@ -141,7 +141,7 @@ target_link_libraries(cppcodecompletiontest ${QT_QTTEST_LIBRARY} kdev4cppparser ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} - ${KDE4_THREADWEAVER_LIBRARIES} + ${KDE4_THREADWEAVER_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDE4_KDECORE_LIBS} diff --git a/kdevelop/languages/plugins/custom-definesandincludes/CMakeLists.txt b/kdevelop/languages/plugins/custom-definesandincludes/CMakeLists.txt index c7ceffe6..4719b2f6 100644 --- a/kdevelop/languages/plugins/custom-definesandincludes/CMakeLists.txt +++ b/kdevelop/languages/plugins/custom-definesandincludes/CMakeLists.txt @@ -1,11 +1,13 @@ add_subdirectory(kcm_widget) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_subdirectory(compilerprovider) -set( kdevdefinesandincludesmanager_SRCS - definesandincludesmanager.cpp - debugarea.cpp - ) +set(kdevdefinesandincludesmanager_SRCS + definesandincludesmanager.cpp + debugarea.cpp +) kde4_add_plugin( kdevdefinesandincludesmanager ${kdevdefinesandincludesmanager_SRCS}) diff --git a/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt b/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt index 32fc779c..79001a71 100644 --- a/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt +++ b/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt @@ -28,4 +28,6 @@ if(BUILD_kdev_msvcdefinehelper) LIBRARY DESTINATION lib) endif(BUILD_kdev_msvcdefinehelper) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/CMakeLists.txt b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/CMakeLists.txt index 3b627d46..b2b0690d 100644 --- a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/CMakeLists.txt +++ b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/CMakeLists.txt @@ -11,9 +11,6 @@ set( kcm_customdefinesandincludes_SRCS ../debugarea.cpp compilersmodel.cpp compilerswidget.cpp - ) - -kde4_add_ui_files( kcm_customdefinesandincludes_SRCS batchedit.ui includeswidget.ui defineswidget.ui diff --git a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilerswidget.cpp b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilerswidget.cpp index 3eff3941..80070816 100644 --- a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilerswidget.cpp +++ b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilerswidget.cpp @@ -24,6 +24,7 @@ #include "compilerswidget.h" #include +#include #include #include diff --git a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/defineswidget.cpp b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/defineswidget.cpp index f1feac78..4cb1c5b6 100644 --- a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/defineswidget.cpp +++ b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/defineswidget.cpp @@ -19,6 +19,7 @@ #include "defineswidget.h" #include +#include #include "ui_defineswidget.h" #include "definesmodel.h" diff --git a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.cpp b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.cpp index 15cbdd50..973c06dd 100644 --- a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.cpp +++ b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.cpp @@ -20,6 +20,7 @@ #include #include +#include #include diff --git a/kdevelop/projectbuilders/cmakebuilder/CMakeLists.txt b/kdevelop/projectbuilders/cmakebuilder/CMakeLists.txt index 42fe0f1e..01f28197 100644 --- a/kdevelop/projectbuilders/cmakebuilder/CMakeLists.txt +++ b/kdevelop/projectbuilders/cmakebuilder/CMakeLists.txt @@ -32,16 +32,11 @@ configure_file(kdevcmakebuilder.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevcm install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakebuilder.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ########### next target ############### -set( cmakebuilder_cfg_SRCS +set(cmakebuilder_cfg_SRCS cmakebuilderpreferences.cpp -) - -set( cmakebuilder_cfg_UI cmakebuildersettings.ui ) - -kde4_add_ui_files( cmakebuilder_cfg_SRCS ${cmakebuilder_cfg_UI} ) kde4_add_kcfg_files( cmakebuilder_cfg_SRCS cmakebuilderconfig.kcfgc ) kde4_add_plugin( kcm_kdev_cmakebuilder ${cmakebuilder_cfg_SRCS} ) diff --git a/kdevelop/projectbuilders/makebuilder/CMakeLists.txt b/kdevelop/projectbuilders/makebuilder/CMakeLists.txt index 401821ec..aac811db 100644 --- a/kdevelop/projectbuilders/makebuilder/CMakeLists.txt +++ b/kdevelop/projectbuilders/makebuilder/CMakeLists.txt @@ -1,8 +1,6 @@ project(makebuilder) add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9037 ) - - ########### next target ############### set(kdevmakebuilder_LIB_SRCS @@ -26,14 +24,9 @@ install(TARGETS kdevmakebuilder DESTINATION ${PLUGIN_INSTALL_DIR} ) set( makebuilder_cfg_SRCS makebuilderpreferences.cpp -) - -set( makebuilder_cfg_UI makeconfig.ui ) - -kde4_add_ui_files( makebuilder_cfg_SRCS ${makebuilder_cfg_UI} ) kde4_add_kcfg_files( makebuilder_cfg_SRCS makebuilderconfig.kcfgc ) kde4_add_plugin( kcm_kdev_makebuilder ${makebuilder_cfg_SRCS} ) target_link_libraries( kcm_kdev_makebuilder ${KDE4_KIO_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} ) diff --git a/kdevelop/projectbuilders/ninjabuilder/CMakeLists.txt b/kdevelop/projectbuilders/ninjabuilder/CMakeLists.txt index be55f488..1cfc3b88 100644 --- a/kdevelop/projectbuilders/ninjabuilder/CMakeLists.txt +++ b/kdevelop/projectbuilders/ninjabuilder/CMakeLists.txt @@ -14,14 +14,14 @@ install(TARGETS kdevninja DESTINATION ${PLUGIN_INSTALL_DIR}) ########### configurator ############## -kde4_add_ui_files(ninjabuilder_cfg_SRCS ninjaconfig.ui) kde4_add_kcfg_files(ninjabuilder_cfg_SRCS ninjabuilderconfig.kcfgc) kde4_add_plugin(kcm_kdev_ninjabuilder ninjabuilderpreferences.cpp ${ninjabuilder_cfg_SRCS}) target_link_libraries(kcm_kdev_ninjabuilder - ${KDE4_KIO_LIBS} - ${KDEVPLATFORM_INTERFACES_LIBRARIES} - ${KDEVPLATFORM_PROJECT_LIBRARIES} - ${KDEVPLATFORM_UTIL_LIBRARIES}) + ${KDE4_KIO_LIBS} + ${KDEVPLATFORM_INTERFACES_LIBRARIES} + ${KDEVPLATFORM_PROJECT_LIBRARIES} + ${KDEVPLATFORM_UTIL_LIBRARIES} +) install(TARGETS kcm_kdev_ninjabuilder DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/kdevelop/projectmanagers/cmake/CMakeLists.txt b/kdevelop/projectmanagers/cmake/CMakeLists.txt index 54c33eef..39d01241 100644 --- a/kdevelop/projectmanagers/cmake/CMakeLists.txt +++ b/kdevelop/projectmanagers/cmake/CMakeLists.txt @@ -1,7 +1,9 @@ project(cmakemanager) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/parser) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_subdirectory(icons) # enable this if you want to have the cmake debug visitor run on each CMakeLists.txt @@ -27,10 +29,6 @@ set( cmakecommon_SRCS cmakeutils.cpp cmakebuilddirchooser.cpp cmakemodelitems.cpp - - ) - -set( cmakecommon_UI cmakebuilddirchooser.ui ) @@ -46,9 +44,6 @@ set( cmakemanager_SRCS cmakecommitchangesjob.cpp cmakeimportjob.cpp cmakeedit.cpp -) - -set( cmakemanager_UI cmakepossibleroots.ui ) @@ -56,9 +51,6 @@ set( cmakesettings_SRCS settings/cmakepreferences.cpp settings/cmakecachemodel.cpp settings/cmakecachedelegate.cpp -) - -set( cmakesettings_UI settings/cmakebuildsettings.ui ) @@ -73,20 +65,18 @@ remove_definitions( -DQT_NO_STL ) # Its only purpose is to support the plugin without needing to add all source files # to the plugin target -kde4_add_ui_files( cmakecommon_SRCS ${cmakecommon_UI} ) add_library( kdev4cmakecommon SHARED ${cmakecommon_SRCS} ) target_link_libraries( kdev4cmakecommon LINK_PRIVATE ${KDE4_KDEUI_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} ${QT_QTSCRIPT_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ) -kde4_add_ui_files( cmakemanager_SRCS ${cmakemanager_UI} ) kde4_add_plugin( kdevcmakemanager ${cmakemanager_SRCS} ) target_link_libraries( kdevcmakemanager ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDEVPLATFORM_UTIL_LIBRARIES} ${KDEVPLATFORM_INTERFACES_LIBRARIES} kdev4cmakecommon ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_OUTPUTVIEW_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS}) - + kde4_add_plugin( kdevcmakedocumentation ${cmakedoc_SRCS} ) target_link_libraries( kdevcmakedocumentation ${KDEVPLATFORM_INTERFACES_LIBRARIES} kdev4cmakecommon @@ -94,7 +84,6 @@ target_link_libraries( kdevcmakedocumentation ${KDEVPLATFORM_DOCUMENTATION_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTWEBKIT_LIBRARY}) -kde4_add_ui_files( cmakesettings_SRCS ${cmakesettings_UI} ) kde4_add_plugin( kcm_kdevcmake_settings ${cmakesettings_SRCS} ) target_link_libraries( kcm_kdevcmake_settings ${KDE4_KIO_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} diff --git a/kdevelop/projectmanagers/cmake/cmakebuilddirchooser.cpp b/kdevelop/projectmanagers/cmake/cmakebuilddirchooser.cpp index ca4ec874..bcaf9e75 100644 --- a/kdevelop/projectmanagers/cmake/cmakebuilddirchooser.cpp +++ b/kdevelop/projectmanagers/cmake/cmakebuilddirchooser.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "ui_cmakebuilddirchooser.h" diff --git a/kdevelop/projectmanagers/cmake/settings/cmakepreferences.cpp b/kdevelop/projectmanagers/cmake/settings/cmakepreferences.cpp index e93b1cc6..1b8d6fac 100644 --- a/kdevelop/projectmanagers/cmake/settings/cmakepreferences.cpp +++ b/kdevelop/projectmanagers/cmake/settings/cmakepreferences.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/kdevelop/projectmanagers/custom-buildsystem/CMakeLists.txt b/kdevelop/projectmanagers/custom-buildsystem/CMakeLists.txt index 2e24ca7f..3ced0c73 100644 --- a/kdevelop/projectmanagers/custom-buildsystem/CMakeLists.txt +++ b/kdevelop/projectmanagers/custom-buildsystem/CMakeLists.txt @@ -7,7 +7,9 @@ include_directories( ${KDE4_INCLUDES} ${KDEVPLATFORM_INCLUDE_DIR}) add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ) ## Unittests -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ## KDevelop Plugin set( custom_SRCS custombuildsystemplugin.cpp custombuildjob.cpp ) @@ -25,11 +27,9 @@ set( custom_kcm_SRCS custombuildsystemconfigwidget.cpp kcm_custombuildsystem.cpp debugarea.cpp - ) -kde4_add_ui_files( custom_kcm_SRCS - configwidget.ui - custombuildsystemconfigwidget.ui - ) + configwidget.ui + custombuildsystemconfigwidget.ui +) kde4_add_kcfg_files( custom_kcm_SRCS kcfg_custombuildsystemconfig.kcfgc ) kde4_add_plugin( kcm_kdevcustombuildsystem ${custom_kcm_SRCS} ) target_link_libraries( kcm_kdevcustombuildsystem ${KDE4_KIO_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} ) diff --git a/kdevelop/projectmanagers/custom-buildsystem/configwidget.cpp b/kdevelop/projectmanagers/custom-buildsystem/configwidget.cpp index 3d33e709..2b0695bf 100644 --- a/kdevelop/projectmanagers/custom-buildsystem/configwidget.cpp +++ b/kdevelop/projectmanagers/custom-buildsystem/configwidget.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include "ui_configwidget.h" #include diff --git a/kdevelop/projectmanagers/custom-buildsystem/custombuildsystemconfigwidget.cpp b/kdevelop/projectmanagers/custom-buildsystem/custombuildsystemconfigwidget.cpp index c4e8d786..02ce010c 100644 --- a/kdevelop/projectmanagers/custom-buildsystem/custombuildsystemconfigwidget.cpp +++ b/kdevelop/projectmanagers/custom-buildsystem/custombuildsystemconfigwidget.cpp @@ -17,10 +17,10 @@ * along with this program; if not, see . * ************************************************************************/ -#include "custombuildsystemconfigwidget.h" - #include +#include +#include "custombuildsystemconfigwidget.h" #include "ui_custombuildsystemconfigwidget.h" #include "configconstants.h" diff --git a/kdevplatform/CMakeLists.txt b/kdevplatform/CMakeLists.txt index 0c66105c..f6e8f65c 100644 --- a/kdevplatform/CMakeLists.txt +++ b/kdevplatform/CMakeLists.txt @@ -15,9 +15,6 @@ set(KDEVPLATFORM_LIB_SOVERSION 8) cmake_minimum_required(VERSION 2.8.9) project(KDevPlatform) -# FIXME: tests are broken -set(ENABLE_TESTING OFF) - set(CMAKE_MODULE_PATH ${KDevPlatform_SOURCE_DIR}/cmake/modules) set(KDE_MIN_VERSION "4.7.0")