From c7c9e8fefcc0e5b20da37aaf2495f7072684adfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Sun, 13 Oct 2013 02:00:32 +0200 Subject: [PATCH] Put steve's changes back in CCMAIL:steveire@gmail.com --- CMakeLists.txt | 9 --------- examples/runner/CMakeLists.txt | 3 --- src/declarativeimports/calendar/CMakeLists.txt | 6 ------ src/declarativeimports/core/CMakeLists.txt | 9 --------- .../plasmacomponents/CMakeLists.txt | 6 ------ .../plasmaextracomponents/CMakeLists.txt | 4 ---- .../qtextracomponents/CMakeLists.txt | 5 ----- .../qtextracomponents/tests/CMakeLists.txt | 2 +- src/plasma/CMakeLists.txt | 10 ---------- src/plasma/autotests/CMakeLists.txt | 4 ---- src/plasma/private/packages.cpp | 2 +- src/plasma/servicejob.cpp | 2 +- .../testcontainmentactionsplugin/CMakeLists.txt | 4 ---- src/plasma/tests/testengine/CMakeLists.txt | 4 ---- src/plasmaquick/CMakeLists.txt | 5 ----- src/platformstatus/CMakeLists.txt | 2 -- src/scriptengines/javascript/CMakeLists.txt | 2 +- src/scriptengines/qml/CMakeLists.txt | 4 +--- src/shell/CMakeLists.txt | 14 +------------- 19 files changed, 6 insertions(+), 91 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d3e86ef0..e00139f7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,15 +150,6 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) remove_definitions(-DQT3_SUPPORT_WARNINGS -DQT3_SUPPORT) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) - -################# setup the include directories ################# -include_directories( ${KDE4_INCLUDES} - ${KF5_INCLUDE_DIRS} # since e-c-m 0.0.7 - ) - -# for including config.h and for includes like -include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/src/plasma/includes) - if(QCA2_FOUND) include_directories( ${QCA2_INCLUDE_DIR} diff --git a/examples/runner/CMakeLists.txt b/examples/runner/CMakeLists.txt index 21ea71de9..beb4d4f2c 100644 --- a/examples/runner/CMakeLists.txt +++ b/examples/runner/CMakeLists.txt @@ -1,9 +1,6 @@ # Project Needs a name, of course project(RunnerExample) -add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -include_directories(${KDE4_INCLUDES}) - # We add our source code here set(example_SRCS homefilesrunner.cpp) diff --git a/src/declarativeimports/calendar/CMakeLists.txt b/src/declarativeimports/calendar/CMakeLists.txt index d10c19e5b..c27b07662 100644 --- a/src/declarativeimports/calendar/CMakeLists.txt +++ b/src/declarativeimports/calendar/CMakeLists.txt @@ -12,12 +12,6 @@ set(calendar_SRCS daysmodel.cpp ) -INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} -) - qt4_automoc(${calendar_SRCS}) add_library(calendarplugin SHARED ${calendar_SRCS}) diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt index 491dd6b87..6925e294f 100644 --- a/src/declarativeimports/core/CMakeLists.txt +++ b/src/declarativeimports/core/CMakeLists.txt @@ -1,14 +1,5 @@ project(corebindings) -INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/src/plasma/includes - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} - ${KDE4_INCLUDE_DIR} - ${KDeclarative_INCLUDE_DIR} -) - add_definitions(-DHAVE_X11=${HAVE_X11}) if(XCB_XCB_FOUND AND XCB_COMPOSITE_FOUND AND XCB_DAMAGE_FOUND) add_definitions(-DHAVE_XCB_COMPOSITE=1) diff --git a/src/declarativeimports/plasmacomponents/CMakeLists.txt b/src/declarativeimports/plasmacomponents/CMakeLists.txt index 719f1d620..90d2563f4 100644 --- a/src/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/src/declarativeimports/plasmacomponents/CMakeLists.txt @@ -14,12 +14,6 @@ set(plasmacomponents_SRCS #../core/declarativeitemcontainer.cpp ) -INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDeclarative_INCLUDE_DIR} -) - add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS}) target_link_libraries(plasmacomponentsplugin ${QT_QTCORE_LIBRARY} diff --git a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt index 24a4d2f1f..15da84856 100644 --- a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt +++ b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt @@ -14,10 +14,6 @@ set(plasmaextracomponents_SRCS fallbackcomponent.cpp ) -include_directories( - ${KACTIVITIES_INCLUDE_DIRS} -) - add_library(plasmaextracomponentsplugin SHARED ${plasmaextracomponents_SRCS}) target_link_libraries(plasmaextracomponentsplugin diff --git a/src/declarativeimports/qtextracomponents/CMakeLists.txt b/src/declarativeimports/qtextracomponents/CMakeLists.txt index 0fe7f6430..1e9b36a64 100644 --- a/src/declarativeimports/qtextracomponents/CMakeLists.txt +++ b/src/declarativeimports/qtextracomponents/CMakeLists.txt @@ -11,11 +11,6 @@ set(qtextracomponents_SRCS columnproxymodel.cpp ) -INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} -) - add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS}) target_link_libraries(qtextracomponentsplugin diff --git a/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt b/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt index d0dac0f79..0799123cd 100644 --- a/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt +++ b/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(.. .) +INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/..") include(ECMMarkAsTest) diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index 460b8db08..2e48ded43 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -26,17 +26,7 @@ endif(NOT X11_FOUND) # URL "http://www.kde.org" TYPE OPTIONAL # PURPOSE "Needed for building several Plasma DataEngines") -include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${KDE4_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR}/KDE - ${KDE4_INCLUDE_DIR}/kio - ) - - - if(NOT PLASMA_NO_KIO) - include_directories(${KDE4_KIO_INCLUDES}) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS}) endif(NOT PLASMA_NO_KIO) diff --git a/src/plasma/autotests/CMakeLists.txt b/src/plasma/autotests/CMakeLists.txt index df29add2f..6b2b4a214 100644 --- a/src/plasma/autotests/CMakeLists.txt +++ b/src/plasma/autotests/CMakeLists.txt @@ -2,10 +2,6 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) include(ECMMarkAsTest) -include_directories ( ${karchive_SOURCE_DIR}/src - ${karchive_BINARY_DIR}/src -) - find_package(KCoreAddons REQUIRED) # add_definitions( -DKDESRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/src/plasma/private/packages.cpp b/src/plasma/private/packages.cpp index f38fd673b..53172afe0 100644 --- a/src/plasma/private/packages.cpp +++ b/src/plasma/private/packages.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. * *******************************************************************************/ -#include "plasma/private/packages_p.h" +#include "private/packages_p.h" #include #include // FLT_MAX diff --git a/src/plasma/servicejob.cpp b/src/plasma/servicejob.cpp index 8961205ee..858169d7c 100644 --- a/src/plasma/servicejob.cpp +++ b/src/plasma/servicejob.cpp @@ -21,7 +21,7 @@ #include -#include +#include "private/servicejob_p.h" namespace Plasma { diff --git a/src/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt b/src/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt index 7f7645bd8..1d3ea5b83 100644 --- a/src/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt +++ b/src/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt @@ -6,10 +6,6 @@ find_package(KDE4 REQUIRED) include(KDE4Defaults) -include_directories(${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES}) - set(test_SRCS test.cpp ) diff --git a/src/plasma/tests/testengine/CMakeLists.txt b/src/plasma/tests/testengine/CMakeLists.txt index 627d0131f..217aae121 100644 --- a/src/plasma/tests/testengine/CMakeLists.txt +++ b/src/plasma/tests/testengine/CMakeLists.txt @@ -4,10 +4,6 @@ find_package(KDE4 REQUIRED) include(KDE4Defaults) -include_directories(${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES}) - set(testengine_engine_SRCS testengine.cpp) diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt index 62f68be3d..113f91afc 100644 --- a/src/plasmaquick/CMakeLists.txt +++ b/src/plasmaquick/CMakeLists.txt @@ -9,11 +9,6 @@ set(plasmaquick_LIB_SRC #private/currentcontainmentactionsmodel_p.cpp ) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ) - add_library(PlasmaQuick SHARED ${plasmaquick_LIB_SRC}) target_link_libraries(PlasmaQuick diff --git a/src/platformstatus/CMakeLists.txt b/src/platformstatus/CMakeLists.txt index 1e9271df3..c98927bb4 100644 --- a/src/platformstatus/CMakeLists.txt +++ b/src/platformstatus/CMakeLists.txt @@ -3,8 +3,6 @@ set( platformstatus.cpp ) -include_directories("../utils") - qt4_add_dbus_adaptor ( kded_platformstatus_SRCS org.kde.platformstatus.xml diff --git a/src/scriptengines/javascript/CMakeLists.txt b/src/scriptengines/javascript/CMakeLists.txt index bc0ff05cc..0852f8f98 100644 --- a/src/scriptengines/javascript/CMakeLists.txt +++ b/src/scriptengines/javascript/CMakeLists.txt @@ -47,7 +47,7 @@ set(simple_javascript_engine_SRCS simplebindings/url.cpp ) -include_directories(${PHONON_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/common) +include_directories(${PHONON_INCLUDES}) plasma_add_plugin(plasma_appletscript_simple_javascript ${simple_javascript_engine_SRCS}) diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt index 335788b7d..5f8a5f9dd 100644 --- a/src/scriptengines/qml/CMakeLists.txt +++ b/src/scriptengines/qml/CMakeLists.txt @@ -7,7 +7,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) set(PLASMA_NO_KIO TRUE) endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) -include_directories(${KDE4_INCLUDE_DIR}/KDE ${PHONON_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/common) +include_directories(${PHONON_INCLUDES}) @@ -22,8 +22,6 @@ set(declarative_appletscript_SRCS plasmoid/wallpaperinterface.cpp ) -include_directories(${PHONON_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/common) - add_library(plasma_appletscript_declarative MODULE ${declarative_appletscript_SRCS} ) set_target_properties(plasma_appletscript_declarative PROPERTIES PREFIX "") diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index e9cdd216f..a71d05169 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -12,8 +12,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) find_path(KDE_MODULES_DIR NAMES KDE4Macros.cmake PATH_SUFFIXES share/cmake/modules) - -add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(-DHAVE_X11=${HAVE_X11}) find_package(Qt5Transitional REQUIRED Core) @@ -23,17 +21,6 @@ find_package(Qt5Script REQUIRED) find_package(KCoreAddons REQUIRED) find_package(Solid REQUIRED) -# The Qt5Widgets_INCLUDES also includes the include directories for -# dependencies QtCore and QtGui -include_directories(${Qt5Widgets_DEFINITIONS} ${Qt5Quick_DEFINITIONS} ${QT_INCLUDES} ${KDE4_INCLUDES}) - -# We need add -DQT_WIDGETS_LIB when using QtWidgets in Qt 5. -add_definitions(${Qt5Widgets_DEFINITIONS} ${Qt5Quick_DEFINITIONS} ${Qt5Qml_DEFINITIONS}) - -# Executables fail to build with Qt 5 in the default configuration -# without -fPIE. We add that here. -set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") - set(scripting_SRC scripting/appinterface.cpp scripting/applet.cpp @@ -89,6 +76,7 @@ target_link_libraries(plasma-shell KF5::KI18n KF5::XmlGui ) +target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}") if(X11_FOUND) target_link_libraries(plasma-shell ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} )