alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove all links to kdeqt5staging

Browse Source 
QCommandLineParser is now in qt5

REVIEW: 112558
This commit is contained in:
Wojciech Kapuscinski 2013-09-06 20:19:19 +02:00
parent 97ce3dc808
commit ea835ccdb1
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -53,8 +53,6 @@ endif()
set (QT_MIN_VERSION "5.2.0") set (QT_MIN_VERSION "5.2.0")
find_package(kdeqt5staging REQUIRED NO_MODULE)
# Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs: # Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs:
find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver
@ -144,9 +142,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FR
################# setup the include directories ################# ################# setup the include directories #################
include_directories( ${kdeqt5staging_INCLUDE_DIRS} include_directories( ${KDE4_INCLUDES}
${kdeqt5staging_INCLUDE_DIR}
${KDE4_INCLUDES}
${KF5_INCLUDE_DIRS} # since e-c-m 0.0.7 ${KF5_INCLUDE_DIRS} # since e-c-m 0.0.7
) )

2
src/plasma/CMakeLists.txt
View File

@ -31,8 +31,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}
${KDE4_INCLUDE_DIR}/KDE ${KDE4_INCLUDE_DIR}/KDE
${KDE4_INCLUDE_DIR}/kio ${KDE4_INCLUDE_DIR}/kio
#FIXME: this will go into Qt upstream
${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/
) )

2
src/plasma/tests/kplugins/CMakeLists.txt
View File

@ -5,7 +5,7 @@ add_executable(plugintest
plugintest.cpp plugintest.cpp
) )
target_link_libraries(plugintest kdeqt5staging plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} ) target_link_libraries(plugintest plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} )
message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}") message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}")

2
src/plasmapkg/CMakeLists.txt
View File

@ -5,7 +5,7 @@ add_executable(plasmapkg
plasmapkg.cpp plasmapkg.cpp
) )
target_link_libraries(plasmapkg kdeqt5staging plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} KF5::KCoreAddons) target_link_libraries(plasmapkg plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} KF5::KCoreAddons)
message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}") message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}")

1
src/shell/CMakeLists.txt
View File

@ -89,7 +89,6 @@ target_link_libraries(plasma-shell
kdeclarative kdeclarative
KF5::KI18n KF5::KI18n
KF5::XmlGui KF5::XmlGui
kdeqt5staging
) )
if(X11_FOUND) if(X11_FOUND)