From e31da1d693b334f098924b268cb2dcbd2ff66304 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 25 Sep 2015 01:45:51 +0000 Subject: [PATCH] generic: misc cleanups --- cmake/modules/FindKDE4Internal.cmake | 7 +++---- kdecore/CMakeLists.txt | 4 ++-- kio/kio/thumbcreator.h | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake index 4c0b0fbe..3ab3c031 100644 --- a/cmake/modules/FindKDE4Internal.cmake +++ b/cmake/modules/FindKDE4Internal.cmake @@ -147,10 +147,6 @@ # KDE4_SERIALIZE_TOOL - wrapper to serialize potentially resource-intensive commands during # parallel builds (set to 'icecc' when using icecream) # -# It also adds the following macros and functions (from KDE4Macros.cmake) -# KDE4_ADD_UI_FILES (SRCS_VAR file1.ui ... fileN.ui) -# Use this to add Qt designer ui files to your application/library. -# # KDE4_ADD_KCFG_FILES (SRCS_VAR [GENERATE_MOC] [USE_RELATIVE_PATH] file1.kcfgc ... fileN.kcfgc) # Use this to add KDE config compiler files to your application/library. # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. @@ -171,6 +167,9 @@ # KDESRCDIR is set to the source directory of the test, this can be used # with KGlobal::dirs()->addResourceDir( "data", KDESRCDIR ) # +# KDE4_ADD_MANUAL_TEST (testname file1 ... fileN) +# same as KDE_ADD_TEST() except that the test is not run on `make test` +# # KDE4_INSTALL_ICONS( path theme) # Installs all png and svgz files in the current directory to the icon # directory given in path, in the subdirectory for the given icon theme. diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index 7496aef8..2f582830 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -65,9 +65,9 @@ set(kdecore_OPTIONAL_LIBS) add_definitions(-DQT_NO_CAST_FROM_ASCII) # Needed for the kdatetime test in release mode -if(KDE4_BUILD_TESTS) +if(ENABLE_TESTING) add_definitions(-DCOMPILING_TESTS) -endif(KDE4_BUILD_TESTS) +endif(ENABLE_TESTING) # compile bzip2 support if available if(BZIP2_FOUND) diff --git a/kio/kio/thumbcreator.h b/kio/kio/thumbcreator.h index 00764931..babb4983 100644 --- a/kio/kio/thumbcreator.h +++ b/kio/kio/thumbcreator.h @@ -61,8 +61,6 @@ class QWidget; * set(filetypethumbnail_SRCS filetypethumbnail.cpp) * * - * kde4_add_ui_files(filetypethumbnail_SRCS config.ui ) - * * kde4_add_plugin(filetypethumbnail ${filetypethumbnail_SRCS}) * target_link_libraries(filetypethumbnail ${KDE4_KIO_LIBS}) *