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

List:       kde-commits
Subject:    [ki18n] /: Remove obsolete CMake code from pre-splitting
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-01-31 17:35:12
Message-ID: E1W9Hzk-0006uR-Dw () scm ! kde ! org
[Download RAW message or body]

Git commit bcd8e339e51b23c13a3cb0bdfff4015874793709 by Alex Merry.
Committed on 31/01/2014 at 11:53.
Pushed by alexmerry into branch 'master'.

Remove obsolete CMake code from pre-splitting

REVIEW: 115411

M  +2    -8    CMakeLists.txt

http://commits.kde.org/ki18n/bcd8e339e51b23c13a3cb0bdfff4015874793709

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf678c4..87c27e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,11 +38,7 @@ set_package_properties(LibIntl PROPERTIES TYPE REQUIRED
 	PURPOSE "Needed for building KI18n unless glibc is the system libc implem=
entation"
 )
 =

-if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  find_package(KF5JS ${KF5_VERSION} REQUIRED)
-else()
-  set(KJS_CREATE_HASH_TABLE "${CMAKE_SOURCE_DIR}/tier1/kjs/src/kjs/create_=
hash_table")
-endif()
+find_package(KF5JS ${KF5_VERSION} REQUIRED)
 =

 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
 remove_definitions(-DQT_NO_CAST_TO_ASCII)
@@ -74,6 +70,4 @@ install( FILES
     cmake/kf5i18nuic.cmake
     DESTINATION ${CMAKECONFIG_INSTALL_DIR} 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]