summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnu Mittal <anu22mittal@gmail.com>2015-02-07 12:20:25 (GMT)
committerAnu Mittal <anu22mittal@gmail.com>2015-02-09 14:19:54 (GMT)
commit12c0dc12b39cbff4eb65b16a89b7861079ddb330 (patch)
tree92f8ba48e533524ccf20c87191e3f686f10f8533
parent768265a6f4462538c81d9be9fe46bdfb979ad2e4 (diff)
Porting: plasmoid CMakeLists.txt
-rw-r--r--plasmoid/applet/concentrationPlasmoid/CMakeLists.txt8
-rw-r--r--plasmoid/applet/didyouknow/CMakeLists.txt8
-rw-r--r--plasmoid/applet/gasPlasmoid/CMakeLists.txt8
-rw-r--r--plasmoid/applet/nuclearPlasmoid/CMakeLists.txt12
-rw-r--r--plasmoid/applet/psePlasmoid/CMakeLists.txt30
-rw-r--r--plasmoid/engine/CMakeLists.txt6
6 files changed, 26 insertions, 46 deletions
diff --git a/plasmoid/applet/concentrationPlasmoid/CMakeLists.txt b/plasmoid/applet/concentrationPlasmoid/CMakeLists.txt
index 32ea556..b8ef22d 100644
--- a/plasmoid/applet/concentrationPlasmoid/CMakeLists.txt
+++ b/plasmoid/applet/concentrationPlasmoid/CMakeLists.txt
@@ -1,11 +1,11 @@
project(concentrationCalculator)
set(concentrationCalculator_SRCS concentrationCalculator.cpp)
-kde4_add_ui_files(concentrationCalculator_SRCS concentrationCalculatorConfig.ui)
-kde4_add_plugin(concentrationCalculator ${concentrationCalculator_SRCS})
+qt5_wrap_ui(concentrationCalculator_SRCS concentrationCalculatorConfig.ui)
+add_library(concentrationCalculator ${concentrationCalculator_SRCS})
target_link_libraries(concentrationCalculator
- ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}
- ${KDE4_KUNITCONVERSION_LIBRARY}
+ KF5::Plasma KF5::WidgetsAddons
+ KF5::UnitConversion
)
install(TARGETS concentrationCalculator DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/plasmoid/applet/didyouknow/CMakeLists.txt b/plasmoid/applet/didyouknow/CMakeLists.txt
index f6ca9e3..0079fd3 100644
--- a/plasmoid/applet/didyouknow/CMakeLists.txt
+++ b/plasmoid/applet/didyouknow/CMakeLists.txt
@@ -1,15 +1,13 @@
-include_directories(
- ${CMAKE_SOURCE_DIR}/libkdeedu/libscience/
- )
+#include_directories(${CMAKE_SOURCE_DIR}/libkdeedu/libscience/)
set(didyouknow_plasma_SRCS
didyouknow.cpp
)
-kde4_add_plugin(plasma_applet_didyouknow ${didyouknow_plasma_SRCS})
+add_library(plasma_applet_didyouknow ${didyouknow_plasma_SRCS})
target_link_libraries(plasma_applet_didyouknow
- ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}
+ KF5::Plasma KF5::KIOWidgests
science
)
diff --git a/plasmoid/applet/gasPlasmoid/CMakeLists.txt b/plasmoid/applet/gasPlasmoid/CMakeLists.txt
index 7d199bb..8105380 100644
--- a/plasmoid/applet/gasPlasmoid/CMakeLists.txt
+++ b/plasmoid/applet/gasPlasmoid/CMakeLists.txt
@@ -1,11 +1,11 @@
project(gasCalculator)
set(gasCalculator_SRCS gasCalculator.cpp)
-kde4_add_ui_files(gasCalculator_SRCS gasCalculatorConfig.ui)
-kde4_add_plugin(gasCalculator ${gasCalculator_SRCS})
+qt5_wrap_ui(gasCalculator_SRCS gasCalculatorConfig.ui)
+add_library(gasCalculator ${gasCalculator_SRCS})
target_link_libraries(gasCalculator
- ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}
- ${KDE4_KUNITCONVERSION_LIBRARY}
+ KF5::Plasma KF5::Ui KF5::WidgetsAddons
+ KF5::UnitConversion
)
install(TARGETS gasCalculator DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/plasmoid/applet/nuclearPlasmoid/CMakeLists.txt b/plasmoid/applet/nuclearPlasmoid/CMakeLists.txt
index 4acfab6..90c77a9 100644
--- a/plasmoid/applet/nuclearPlasmoid/CMakeLists.txt
+++ b/plasmoid/applet/nuclearPlasmoid/CMakeLists.txt
@@ -1,18 +1,16 @@
project(nuclearCalculator)
-include_directories(
- ${CMAKE_SOURCE_DIR}/libkdeedu/libscience/
- )
+#include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/libscience/)
set(nuclearCalculator_SRCS
nuclearCalculator.cpp
kalziumdataobject.cpp
)
-kde4_add_ui_files(nuclearCalculator_SRCS nuclearCalculatorConfig.ui)
-kde4_add_plugin(nuclearCalculator ${nuclearCalculator_SRCS})
+qt5_wrap_ui(nuclearCalculator_SRCS nuclearCalculatorConfig.ui)
+add_library(nuclearCalculator ${nuclearCalculator_SRCS})
target_link_libraries(nuclearCalculator
- ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBRARY}
- science ${KDE4_KUNITCONVERSION_LIBRARY}
+ KF5::Plasma KF5::Ui KF5::KHtml
+ science KF5::UnitConversion
)
install(TARGETS nuclearCalculator DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/plasmoid/applet/psePlasmoid/CMakeLists.txt b/plasmoid/applet/psePlasmoid/CMakeLists.txt
index 58da62f..7f2d736 100644
--- a/plasmoid/applet/psePlasmoid/CMakeLists.txt
+++ b/plasmoid/applet/psePlasmoid/CMakeLists.txt
@@ -1,23 +1,7 @@
-include_directories(
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
- ${KDE4_INCLUDES}
- ${CMAKE_SOURCE_DIR}/libkdeedu/libscience
- )
-
-# We add our source code here
-set(periodic_SRCS Molmasscalculator.cpp Periodictable.cpp)
-
-kde4_add_ui_files(periodic_SRCS Molmassconfig.ui)
-
-# Now make sure all files get to the right place
-kde4_add_plugin(plasma_applet_molmassCalculator ${periodic_SRCS})
-
-target_link_libraries(plasma_applet_molmassCalculator
- ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} science)
-
-install(TARGETS plasma_applet_molmassCalculator
- DESTINATION ${PLUGIN_INSTALL_DIR})
-
-install(FILES plasma-applet-Molmasscalculator.desktop
- DESTINATION ${SERVICES_INSTALL_DIR})
+MESSAGE(STATUS "Kalzium Plasma widget 'bodr' disabled, needs porting")
+#add_subdirectory(bodr)
+add_subdirectory(didyouknow)
+add_subdirectory(nuclearPlasmoid)
+add_subdirectory(concentrationPlasmoid)
+add_subdirectory(gasPlasmoid)
+add_subdirectory(psePlasmoid)
diff --git a/plasmoid/engine/CMakeLists.txt b/plasmoid/engine/CMakeLists.txt
index 534a56d..8b4bcb0 100644
--- a/plasmoid/engine/CMakeLists.txt
+++ b/plasmoid/engine/CMakeLists.txt
@@ -6,10 +6,10 @@ include_directories(
${CMAKE_SOURCE_DIR}/libkdeedu/libscience/
)
-kde4_add_plugin(plasma_engine_kalzium ${kalzium_engine_SRCS})
+add_library(plasma_engine_kalzium ${kalzium_engine_SRCS})
target_link_libraries(plasma_engine_kalzium
- ${KDE4_PLASMA_LIBS}
- ${QT_QTXML_LIBRARY}
+ KF5::Plasma
+ Qt5::Xml
science
)