[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [skrooge] /: Build error
From:       Stephane Mankowski <stephane () mankowski ! fr>
Date:       2016-07-14 18:58:57
Message-ID: E1bNlqb-0008Fn-JH () code ! kde ! org
[Download RAW message or body]

Git commit d99a49e1e84c7947c4a5d638e036d4f66aaa8815 by Stephane Mankowski.
Committed on 14/07/2016 at 18:58.
Pushed by smankowski into branch 'master'.

Build error

M  +6    -3    CMakeLists.txt

http://commits.kde.org/skrooge/d99a49e1e84c7947c4a5d638e036d4f66aaa8815

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb27be1..a006927 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,9 @@ PROJECT(skrooge)
 =

 SET (QT_MIN_VERSION "5.3.0")
 =

+OPTION(SKG_BUILD_TEST "Build the test" ON)
+OPTION(SKG_DESIGNER   "Build designer library" ON)
+
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
 CMAKE_POLICY(SET CMP0028 OLD)
 IF(POLICY CMP0063)
@@ -43,6 +46,9 @@ INCLUDE(KDEFrameworkCompilerSettings)
 FIND_PACKAGE(Qt5 ${QT_MIN_VERSION} NO_MODULE REQUIRED Core DBus Widgets We=
bKitWidgets Script Sql Test PrintSupport Svg Xml Concurrent Qml QuickWidget=
s)
 IF(SKG_DESIGNER)
   FIND_PACKAGE(Qt5 ${QT_MIN_VERSION} NO_MODULE REQUIRED Designer )
+  FIND_PACKAGE(KF5 5.0.0 REQUIRED COMPONENTS
+    DesignerPlugin        # Tier 3
+  )  =

 ELSE(SKG_DESIGNER)
   SET(SKG_BUILD_TEST OFF)
 ENDIF(SKG_DESIGNER)
@@ -60,7 +66,6 @@ FIND_PACKAGE(KF5 5.0.0 REQUIRED COMPONENTS
   Completion            # Tier 2
   JobWidgets            # Tier 2
   ConfigWidgets         # Tier 3
-  DesignerPlugin        # Tier 3
   IconThemes            # Tier 3
   KIO                   # Tier 3
   NewStuff              # Tier 3
@@ -114,8 +119,6 @@ MARK_AS_ADVANCED(SKG_BASH)
 =

 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-OPTION(SKG_BUILD_TEST "Build the test" ON)
-OPTION(SKG_DESIGNER   "Build designer library" ON)
 MESSAGE( STATUS "     PROJECT_SOURCE_DIR  : " ${PROJECT_SOURCE_DIR} )
 MESSAGE( STATUS "     PROJECT_BINARY_DIR  : " ${PROJECT_BINARY_DIR} )
 MESSAGE( STATUS "     CMAKE_BUILD_TYPE    : " ${CMAKE_BUILD_TYPE} )
[prev in list] [next in list] [prev in thread] [next in thread]