Remove obsolete include_directories use.

This commit is contained in:
Stephen Kelly 2013-10-12 15:24:32 +02:00
parent a3c7a9690f
commit bef789642e
19 changed files with 12 additions and 92 deletions

View File

@ -150,15 +150,6 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
remove_definitions(-DQT3_SUPPORT_WARNINGS -DQT3_SUPPORT) 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) 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 <kparts/foo.h>
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) if(QCA2_FOUND)
include_directories( include_directories(
${QCA2_INCLUDE_DIR} ${QCA2_INCLUDE_DIR}

View File

@ -1,9 +1,6 @@
# Project Needs a name, of course # Project Needs a name, of course
project(RunnerExample) project(RunnerExample)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(${KDE4_INCLUDES})
# We add our source code here # We add our source code here
set(example_SRCS homefilesrunner.cpp) set(example_SRCS homefilesrunner.cpp)

View File

@ -12,12 +12,6 @@ set(calendar_SRCS
daysmodel.cpp daysmodel.cpp
) )
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
)
qt4_automoc(${calendar_SRCS}) qt4_automoc(${calendar_SRCS})
add_library(calendarplugin SHARED ${calendar_SRCS}) add_library(calendarplugin SHARED ${calendar_SRCS})

View File

@ -1,14 +1,5 @@
project(corebindings) 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}) add_definitions(-DHAVE_X11=${HAVE_X11})
if(XCB_XCB_FOUND AND XCB_COMPOSITE_FOUND AND XCB_DAMAGE_FOUND) if(XCB_XCB_FOUND AND XCB_COMPOSITE_FOUND AND XCB_DAMAGE_FOUND)
add_definitions(-DHAVE_XCB_COMPOSITE=1) add_definitions(-DHAVE_XCB_COMPOSITE=1)

View File

@ -14,12 +14,6 @@ set(plasmacomponents_SRCS
#../core/declarativeitemcontainer.cpp #../core/declarativeitemcontainer.cpp
) )
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDeclarative_INCLUDE_DIR}
)
add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS}) add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS})
target_link_libraries(plasmacomponentsplugin target_link_libraries(plasmacomponentsplugin
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}

View File

@ -14,10 +14,6 @@ set(plasmaextracomponents_SRCS
fallbackcomponent.cpp fallbackcomponent.cpp
) )
include_directories(
${KACTIVITIES_INCLUDE_DIRS}
)
add_library(plasmaextracomponentsplugin SHARED ${plasmaextracomponents_SRCS}) add_library(plasmaextracomponentsplugin SHARED ${plasmaextracomponents_SRCS})
target_link_libraries(plasmaextracomponentsplugin target_link_libraries(plasmaextracomponentsplugin

View File

@ -11,11 +11,6 @@ set(qtextracomponents_SRCS
columnproxymodel.cpp columnproxymodel.cpp
) )
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
)
add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS}) add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS})
target_link_libraries(qtextracomponentsplugin target_link_libraries(qtextracomponentsplugin

View File

@ -1,4 +1,4 @@
INCLUDE_DIRECTORIES(.. .) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/..")
include(ECMMarkAsTest) include(ECMMarkAsTest)

View File

@ -26,17 +26,7 @@ endif(NOT X11_FOUND)
# URL "http://www.kde.org" TYPE OPTIONAL # URL "http://www.kde.org" TYPE OPTIONAL
# PURPOSE "Needed for building several Plasma DataEngines") # 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) if(NOT PLASMA_NO_KIO)
include_directories(${KDE4_KIO_INCLUDES})
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS}) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS})
endif(NOT PLASMA_NO_KIO) endif(NOT PLASMA_NO_KIO)
@ -169,7 +159,12 @@ if(DL_LIBRARY)
endif(DL_LIBRARY) endif(DL_LIBRARY)
target_link_libraries(plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets) target_link_libraries(plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets)
target_include_directories(plasma INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR};${INCLUDE_INSTALL_DIR}/KDE>" ) target_include_directories(plasma PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/includes>"
)
target_include_directories(plasma INTERFACE
"$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR};${INCLUDE_INSTALL_DIR}/KDE>"
)
#do NOT use GENERIC versioning -- the plasma team will take care of versioning #do NOT use GENERIC versioning -- the plasma team will take care of versioning
set_target_properties(plasma PROPERTIES set_target_properties(plasma PROPERTIES

View File

@ -2,10 +2,6 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
include(ECMMarkAsTest) include(ECMMarkAsTest)
include_directories ( ${karchive_SOURCE_DIR}/src
${karchive_BINARY_DIR}/src
)
find_package(KCoreAddons REQUIRED) find_package(KCoreAddons REQUIRED)
# add_definitions( -DKDESRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ) # add_definitions( -DKDESRCDIR=${CMAKE_CURRENT_SOURCE_DIR} )

View File

@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA. * * Boston, MA 02110-1301, USA. *
*******************************************************************************/ *******************************************************************************/
#include "plasma/private/packages_p.h" #include "private/packages_p.h"
#include <math.h> #include <math.h>
#include <float.h> // FLT_MAX #include <float.h> // FLT_MAX

View File

@ -21,7 +21,7 @@
#include <QDebug> #include <QDebug>
#include <plasma/private/servicejob_p.h> #include "private/servicejob_p.h"
namespace Plasma namespace Plasma
{ {

View File

@ -6,10 +6,6 @@ find_package(KDE4 REQUIRED)
include(KDE4Defaults) include(KDE4Defaults)
include_directories(${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES})
set(test_SRCS set(test_SRCS
test.cpp test.cpp
) )

View File

@ -4,10 +4,6 @@ find_package(KDE4 REQUIRED)
include(KDE4Defaults) include(KDE4Defaults)
include_directories(${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES})
set(testengine_engine_SRCS set(testengine_engine_SRCS
testengine.cpp) testengine.cpp)

View File

@ -9,11 +9,6 @@ set(plasmaquick_LIB_SRC
#private/currentcontainmentactionsmodel_p.cpp #private/currentcontainmentactionsmodel_p.cpp
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
add_library(PlasmaQuick SHARED ${plasmaquick_LIB_SRC}) add_library(PlasmaQuick SHARED ${plasmaquick_LIB_SRC})
target_link_libraries(PlasmaQuick target_link_libraries(PlasmaQuick

View File

@ -3,8 +3,6 @@ set(
platformstatus.cpp platformstatus.cpp
) )
include_directories("../utils")
qt4_add_dbus_adaptor ( qt4_add_dbus_adaptor (
kded_platformstatus_SRCS kded_platformstatus_SRCS
org.kde.platformstatus.xml org.kde.platformstatus.xml

View File

@ -47,7 +47,7 @@ set(simple_javascript_engine_SRCS
simplebindings/url.cpp 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}) plasma_add_plugin(plasma_appletscript_simple_javascript ${simple_javascript_engine_SRCS})

View File

@ -7,7 +7,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(PLASMA_NO_KIO TRUE) set(PLASMA_NO_KIO TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) 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 plasmoid/wallpaperinterface.cpp
) )
include_directories(${PHONON_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/common)
add_library(plasma_appletscript_declarative MODULE ${declarative_appletscript_SRCS} ) add_library(plasma_appletscript_declarative MODULE ${declarative_appletscript_SRCS} )
set_target_properties(plasma_appletscript_declarative PROPERTIES PREFIX "") set_target_properties(plasma_appletscript_declarative PROPERTIES PREFIX "")

View File

@ -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) 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}) add_definitions(-DHAVE_X11=${HAVE_X11})
find_package(Qt5Transitional REQUIRED Core) find_package(Qt5Transitional REQUIRED Core)
@ -23,17 +21,6 @@ find_package(Qt5Script REQUIRED)
find_package(KCoreAddons REQUIRED) find_package(KCoreAddons REQUIRED)
find_package(Solid 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 set(scripting_SRC
scripting/appinterface.cpp scripting/appinterface.cpp
scripting/applet.cpp scripting/applet.cpp
@ -89,6 +76,7 @@ target_link_libraries(plasma-shell
KF5::KI18n KF5::KI18n
KF5::XmlGui KF5::XmlGui
) )
target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}")
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(plasma-shell ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} ) target_link_libraries(plasma-shell ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} )