[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [sprinter-plugins] /: compile fixes
From: Aaron Seigo <aseigo () kde ! org>
Date: 2016-01-01 0:50:01
Message-ID: E1aEnur-0004Eq-0S () scm ! kde ! org
[Download RAW message or body]
Git commit 4bd0e1efbd5445b92bb06d75d678aafd0d587250 by Aaron Seigo.
Committed on 01/01/2016 at 00:49.
Pushed by aseigo into branch 'master'.
compile fixes
M +4 -1 CMakeLists.txt
M +1 -1 activities/CMakeLists.txt
M +1 -1 applications/CMakeLists.txt
M +1 -1 calculator/CMakeLists.txt
M +2 -2 datetime/CMakeLists.txt
M +2 -2 filesystem/CMakeLists.txt
M +2 -2 kill/CMakeLists.txt
M +2 -2 places/CMakeLists.txt
M +1 -1 powerdevil/CMakeLists.txt
M +2 -2 recentdocs/CMakeLists.txt
M +2 -2 uri/CMakeLists.txt
M +1 -1 windows/CMakeLists.txt
M +3 -3 windows/windows.h
M +1 -0 youtube/CMakeLists.txt
http://commits.kde.org/sprinter-plugins/4bd0e1efbd5445b92bb06d75d678aafd0d5=
87250
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab1922c..4338196 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,11 +9,14 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH})
=
include(FeatureSummary)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
=
find_package(Sprinter REQUIRED)
find_package(KSysguardProc)
#TODO: make i18n optional for runners that don't need it?
-find_package(KF5 NO_MODULE
+find_package(KF5 REQUIRED
COMPONENTS I18n
OPTIONAL_COMPONENTS
Activities
diff --git a/activities/CMakeLists.txt b/activities/CMakeLists.txt
index 90a5f45..49d783e 100644
--- a/activities/CMakeLists.txt
+++ b/activities/CMakeLists.txt
@@ -4,6 +4,6 @@ add_definitions(-DQT_PLUGIN)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(${PROJECT_NAME} SHARED activities.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui DBus)
-target_link_libraries(${PROJECT_NAME} KF5::Activities KF5::I18n)
+target_link_libraries(${PROJECT_NAME} KF5::Activities KF5::I18n Sprinter)
=
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index b964498..f520a89 100644
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -4,6 +4,6 @@ add_definitions(-DQT_PLUGIN)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(${PROJECT_NAME} SHARED applications.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} Sprinter KF5::I18n KF5::Service KF5:=
:KIOWidgets)
+target_link_libraries(${PROJECT_NAME} Sprinter KF5::I18n KF5::Service KF5:=
:KIOWidgets Sprinter)
=
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/calculator/CMakeLists.txt b/calculator/CMakeLists.txt
index 886a86a..13d6b9a 100644
--- a/calculator/CMakeLists.txt
+++ b/calculator/CMakeLists.txt
@@ -12,5 +12,5 @@ add_library(${PROJECT_NAME} SHARED
calculator.cpp
qalculate_engine.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
-target_link_libraries(${PROJECT_NAME} ${QALCULATE_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${QALCULATE_LIBRARIES} Sprinter)
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/datetime/CMakeLists.txt b/datetime/CMakeLists.txt
index 98d3d99..8d2b7c0 100644
--- a/datetime/CMakeLists.txt
+++ b/datetime/CMakeLists.txt
@@ -4,10 +4,10 @@ add_definitions(-DQT_PLUGIN)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(${PROJECT_NAME} SHARED datetime.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} KF5::I18n)
+target_link_libraries(${PROJECT_NAME} KF5::I18n Sprinter)
=
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
=
=
# get_directory_property(DBG INCLUDE_DIRECTORIES)
-# message("****************** ${DBG}")
\ No newline at end of file
+# message("****************** ${DBG}")
diff --git a/filesystem/CMakeLists.txt b/filesystem/CMakeLists.txt
index 1d693c3..226b1d5 100644
--- a/filesystem/CMakeLists.txt
+++ b/filesystem/CMakeLists.txt
@@ -4,10 +4,10 @@ add_definitions(-DQT_PLUGIN)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(${PROJECT_NAME} SHARED filesystem.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} KF5::KIOWidgets KF5::I18n)
+target_link_libraries(${PROJECT_NAME} KF5::KIOWidgets KF5::I18n Sprinter)
=
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
=
=
# get_directory_property(DBG INCLUDE_DIRECTORIES)
-# message("****************** ${DBG}")
\ No newline at end of file
+# message("****************** ${DBG}")
diff --git a/kill/CMakeLists.txt b/kill/CMakeLists.txt
index 582c1fb..f3ce75e 100644
--- a/kill/CMakeLists.txt
+++ b/kill/CMakeLists.txt
@@ -4,5 +4,5 @@ add_definitions(-DQT_PLUGIN)
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${KSYSGUARDPROC_INCLUDE_DI=
RS})
add_library(${PROJECT_NAME} SHARED kill.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} KF5::KIOWidgets KF5::I18n KF5::KIOCo=
re KF5::Auth ${KSYSGUARDPROC_LIBRARIES})
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
\ No newline at end of file
+target_link_libraries(${PROJECT_NAME} KF5::KIOWidgets KF5::I18n KF5::KIOCo=
re KF5::Auth Sprinter ${KSYSGUARDPROC_LIBRARIES})
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/places/CMakeLists.txt b/places/CMakeLists.txt
index cb4153e..b41d999 100644
--- a/places/CMakeLists.txt
+++ b/places/CMakeLists.txt
@@ -5,5 +5,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
=
add_library(${PROJECT_NAME} SHARED places.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} KF5::KIOFileWidgets KF5::I18n)
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
\ No newline at end of file
+target_link_libraries(${PROJECT_NAME} KF5::KIOFileWidgets KF5::I18n Sprint=
er)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/powerdevil/CMakeLists.txt b/powerdevil/CMakeLists.txt
index 466cd52..6f8f578 100644
--- a/powerdevil/CMakeLists.txt
+++ b/powerdevil/CMakeLists.txt
@@ -5,5 +5,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
=
add_library(${PROJECT_NAME} SHARED powerdevil.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} KF5::Solid KF5::I18n KF5::KDELibs4Su=
pport Qt5::DBus)
+target_link_libraries(${PROJECT_NAME} KF5::Solid KF5::I18n KF5::KDELibs4Su=
pport Qt5::DBus Sprinter)
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/recentdocs/CMakeLists.txt b/recentdocs/CMakeLists.txt
index 319809c..b75dc57 100644
--- a/recentdocs/CMakeLists.txt
+++ b/recentdocs/CMakeLists.txt
@@ -5,5 +5,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
=
add_library(${PROJECT_NAME} SHARED recentdocs.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} KF5::KIOCore KF5::KIOWidgets KF5::C=
oreAddons KF5::ConfigCore)
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
\ No newline at end of file
+target_link_libraries(${PROJECT_NAME} KF5::KIOCore KF5::KIOWidgets KF5::C=
oreAddons KF5::ConfigCore Sprinter)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/uri/CMakeLists.txt b/uri/CMakeLists.txt
index 0c162b3..708768f 100644
--- a/uri/CMakeLists.txt
+++ b/uri/CMakeLists.txt
@@ -4,5 +4,5 @@ add_definitions(-DQT_PLUGIN)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(${PROJECT_NAME} SHARED uri.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} KF5::KIOWidgets KF5::KIOCore)
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
\ No newline at end of file
+target_link_libraries(${PROJECT_NAME} KF5::KIOWidgets KF5::KIOCore Sprinte=
r)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
index 5c2ad6c..9508642 100644
--- a/windows/CMakeLists.txt
+++ b/windows/CMakeLists.txt
@@ -5,5 +5,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
=
add_library(${PROJECT_NAME} SHARED windows.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui)
-target_link_libraries(${PROJECT_NAME} KF5::I18n KF5::WindowSystem Qt5::X11=
Extras)
+target_link_libraries(${PROJECT_NAME} KF5::I18n KF5::WindowSystem Qt5::X11=
Extras Sprinter)
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
diff --git a/windows/windows.h b/windows/windows.h
index 11d2a10..97bb8b5 100644
--- a/windows/windows.h
+++ b/windows/windows.h
@@ -40,9 +40,9 @@ public:
virtual bool exec(const Sprinter::QueryMatch &match);
=
private Q_SLOTS:
- void prepareForMatchSession();
- void matchSessionComplete();
- void gatherInfo();
+// void prepareForMatchSession();
+// void matchSessionComplete();
+// void gatherInfo();
=
private:
enum WindowAction {
diff --git a/youtube/CMakeLists.txt b/youtube/CMakeLists.txt
index 8ba4414..26854e4 100644
--- a/youtube/CMakeLists.txt
+++ b/youtube/CMakeLists.txt
@@ -4,5 +4,6 @@ add_definitions(-DQT_PLUGIN)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(${PROJECT_NAME} SHARED youtube.cpp)
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
+target_link_libraries(${PROJECT_NAME} Sprinter)
=
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SPRINTER_PLUGINS_PAT=
H})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic