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

List:       kde-commits
Subject:    [kdeexamples] framework-template: Remove obsolete CMake code from pre-splitting
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-01-31 17:37:31
Message-ID: E1W9I1z-0006xE-7B () scm ! kde ! org
[Download RAW message or body]

Git commit b09feffd065796fe5ff511bd7083f410b2abaf06 by Alex Merry.
Committed on 31/01/2014 at 17:37.
Pushed by alexmerry into branch 'master'.

Remove obsolete CMake code from pre-splitting

M  +3    -15   framework-template/CMakeLists.txt

http://commits.kde.org/kdeexamples/b09feffd065796fe5ff511bd7083f410b2abaf06

diff --git a/framework-template/CMakeLists.txt b/framework-template/CMakeLi=
sts.txt
index 1464756..943a253 100644
--- a/framework-template/CMakeLists.txt
+++ b/framework-template/CMakeLists.txt
@@ -30,18 +30,8 @@ set(REQUIRED_QT_VERSION "5.2.0")
 # Required Qt5 components to build this framework
 find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
 =

-# TODO: Add all required find_package() calls here
-
-if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  # KF5 frameworks
-  #
-  # Content of this block is only executed when building the framework
-  # standalone. KF5 frameworks required to build this framework should be =
added
-  # here. It is done this way to avoid chicken-and-egg problem when buildi=
ng
-  # KF5 as a whole: one cannot depend on packages which have not been inst=
alled
-  # yet. For example:
-  # find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED)
-endif()
+# TODO: Add all required find_package() calls here. For example:
+# find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED)
 =

 # Subdirectories
 add_subdirectory(src)
@@ -77,6 +67,4 @@ install(FILES
   COMPONENT Devel
 )
 =

-if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-endif()
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
[prev in list] [next in list] [prev in thread] [next in thread]