Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2017-04-30 21:15:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Sun Apr 30 21:15:29 2017 rev:40 rq:492036 version:5.33.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2017-03-28 15:08:47.343733578 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2017-04-30 21:17:35.662026824 +0200
@@ -1,0 +2,23 @@
+Sat Apr 15 10:11:42 CEST 2017 - [email protected]
+
+- Update to 5.33.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.33.0.php
+- Changes since 5.32.0:
+ * KDE compiler settings: treat Clang and AppleClang equally
+ * Improve error messages
+ * Specify qml-root-path as the share directory in the prefix
+ * default for ECM_ADDITIONAL_FIND_ROOT_PATH
+ * Fix ecm_generate_pkgconfig_file compatibility with new cmake
+ * Upgrade ECM version to 5.33.0.
+ * Only register APPLE_* options if(APPLE)
+
+-------------------------------------------------------------------
+Tue Apr 4 18:20:57 UTC 2017 - [email protected]
+
+- Add upstream patches to fix Python binding generation:
+ * 0001-FindPyModGen-Also-search-for-an-unversioned-clang.patch
+ * 0002-Import-Find-Clang-LLVM-from-KDevelop-for-Python-bind.patch
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.32.0.tar.xz
New:
----
0001-FindPyModGen-Also-search-for-an-unversioned-clang.patch
0002-Import-Find-Clang-LLVM-from-KDevelop-for-Python-bind.patch
extra-cmake-modules-5.33.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.45Dljg/_old 2017-04-30 21:17:36.317934343 +0200
+++ /var/tmp/diff_new_pack.45Dljg/_new 2017-04-30 21:17:36.321933779 +0200
@@ -16,15 +16,19 @@
#
-%define _tar_path 5.32
+%define _tar_path 5.33
Name: extra-cmake-modules
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
Url:
https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-Version: 5.32.0
+Version: 5.33.0
Release: 0
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM: Search for unversioned clang
+Patch0: 0001-FindPyModGen-Also-search-for-an-unversioned-clang.patch
+# PATCH-FIX-UPSTREAM: Import FindClangLLVM from KDevelop
+Patch1: 0002-Import-Find-Clang-LLVM-from-KDevelop-for-Python-bind.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 3.0
BuildRequires: gcc-c++
@@ -58,6 +62,8 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
%cmake_kf5 -d build
++++++ 0001-FindPyModGen-Also-search-for-an-unversioned-clang.patch ++++++
>From c4c4d75800fd8f7114897353c137391d56bf5538 Mon Sep 17 00:00:00 2001
From: Heiko Becker <[email protected]>
Date: Tue, 4 Apr 2017 20:14:50 +0200
Subject: [PATCH] FindPyModGen: Also search for an unversioned clang++
Summary:
While my distro does have a versioned clang executable, it doesn't
have a versioned clang++ executable. The versioned executable is
still searched first, falling back to the unversioned one.
Reviewers: #frameworks, #build_system, apol
Reviewed By: apol
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D5291
---
find-modules/FindPythonModuleGeneration.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/find-modules/FindPythonModuleGeneration.cmake
b/find-modules/FindPythonModuleGeneration.cmake
index 012f806..684678b 100644
--- a/find-modules/FindPythonModuleGeneration.cmake
+++ b/find-modules/FindPythonModuleGeneration.cmake
@@ -251,7 +251,7 @@ include(CMakeParseArguments)
set(GPB_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
function(_compute_implicit_include_dirs)
- find_program(_GBP_CLANG_CXX_DRIVER_PATH clang++-${_GPB_CLANG_SUFFIX})
+ find_program(_GBP_CLANG_CXX_DRIVER_PATH NAMES clang++-${_GPB_CLANG_SUFFIX}
clang++)
if (NOT _GBP_CLANG_CXX_DRIVER_PATH)
message(FATAL_ERROR "Failed to find clang driver corresponding to
${libclang_LIBRARY}")
endif()
--
2.12.0
++++++ 0002-Import-Find-Clang-LLVM-from-KDevelop-for-Python-bind.patch ++++++
>From 4fda68a948ee9e525ec6a5a5b08daaf9b32ac954 Mon Sep 17 00:00:00 2001
From: Heiko Becker <[email protected]>
Date: Tue, 4 Apr 2017 20:16:59 +0200
Subject: [PATCH] Import Find{Clang,LLVM} from KDevelop for Python bindings
generation
Summary:
On non Debian-based systems libclang is mostly installed as
libclang.so.<version>, evading detection by
clang-${_LIBCLANG_FIND_VERSION}.0. Instead of specyfing and maintaing
a list of library names I imported FindClang from KDevelop, which
finds the correct library here and, one would assume, also works on
Debian and distros based on it.
I didn't use ClangConfig.cmake from upstream because it doesn't allow
discovery of a certain version.
Test Plan: Successfully built kconfig with Python bindings
Reviewers: #frameworks, #build_system, skelly, kfunk
Subscribers: rdieter, shaheed, kde-buildsystem, lbeltrame
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D5289
---
find-modules/FindClang.cmake | 118 +++++++++++++++++++
find-modules/FindLLVM.cmake | 157 ++++++++++++++++++++++++++
find-modules/FindPythonModuleGeneration.cmake | 28 ++---
3 files changed, 282 insertions(+), 21 deletions(-)
create mode 100644 find-modules/FindClang.cmake
create mode 100644 find-modules/FindLLVM.cmake
diff --git a/find-modules/FindClang.cmake b/find-modules/FindClang.cmake
new file mode 100644
index 0000000..2b539d2
--- /dev/null
+++ b/find-modules/FindClang.cmake
@@ -0,0 +1,118 @@
+# Detect Clang libraries
+#
+# Defines the following variables:
+# CLANG_FOUND - True if Clang was found
+# CLANG_INCLUDE_DIRS - Where to find Clang includes
+# CLANG_LIBRARY_DIRS - Where to find Clang libraries
+#
+# CLANG_LIBCLANG_LIB - Libclang C library
+#
+# CLANG_CLANGFRONTEND_LIB - Clang Frontend (C++) Library
+# CLANG_CLANGDRIVER_LIB - Clang Driver (C++) Library
+# ...
+#
+# CLANG_LIBS - All the Clang C++ libraries
+#
+# Uses the same include and library paths detected by FindLLVM.cmake
+#
+# See http://clang.llvm.org/docs/InternalsManual.html for full list of
libraries
+
+#=============================================================================
+# Copyright 2014-2015 Kevin Funk <[email protected]>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+
+#=============================================================================
+
+set(KNOWN_VERSIONS 4.0 3.9 3.8 3.7 3.6 3.5)
+
+foreach(version ${KNOWN_VERSIONS})
+ if (LLVM_DIR OR (DEFINED Clang_FIND_VERSION AND Clang_FIND_VERSION
VERSION_GREATER version))
+ break()
+ endif ()
+
+ if (${Clang_FIND_REQUIRED})
+ find_package(LLVM ${version} REQUIRED)
+ else ()
+ find_package(LLVM ${version})
+ endif ()
+endforeach()
+
+set(CLANG_FOUND FALSE)
+
+if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+ macro(FIND_AND_ADD_CLANG_LIB _libname_)
+ string(TOUPPER ${_libname_} _prettylibname_)
+ find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS
${LLVM_LIBRARY_DIRS})
+ if(CLANG_${_prettylibname_}_LIB)
+ set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+ endif()
+ endmacro(FIND_AND_ADD_CLANG_LIB)
+
+ # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search
for 'libclang', too
+ find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS
${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+
+ FIND_AND_ADD_CLANG_LIB(clangFrontend)
+ FIND_AND_ADD_CLANG_LIB(clangDriver)
+ FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+ FIND_AND_ADD_CLANG_LIB(clangSema)
+ FIND_AND_ADD_CLANG_LIB(clangChecker)
+ FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+ FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+ FIND_AND_ADD_CLANG_LIB(clangRewrite)
+ FIND_AND_ADD_CLANG_LIB(clangAST)
+ FIND_AND_ADD_CLANG_LIB(clangParse)
+ FIND_AND_ADD_CLANG_LIB(clangLex)
+ FIND_AND_ADD_CLANG_LIB(clangBasic)
+ FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+ FIND_AND_ADD_CLANG_LIB(clangEdit)
+ FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+ FIND_AND_ADD_CLANG_LIB(clangRewrite)
+ FIND_AND_ADD_CLANG_LIB(clangSerialization)
+ FIND_AND_ADD_CLANG_LIB(clangTooling)
+ FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+ FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+ FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+ FIND_AND_ADD_CLANG_LIB(clangSema)
+ FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+endif()
+
+if(CLANG_LIBS OR CLANG_LIBCLANG_LIB)
+ set(CLANG_FOUND TRUE)
+else()
+ message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+endif()
+
+if(CLANG_FOUND)
+ set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+ set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+
+ # check whether llvm-config comes from an install prefix
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+ OUTPUT_VARIABLE _llvmSourceRoot
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+ if (NOT _llvmIsInstalled)
+ message(STATUS "Detected that llvm-config comes from a build-tree, adding
more include directories for Clang")
+ list(APPEND CLANG_INCLUDE_DIRS
+ "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+ "${_llvmSourceRoot}/tools/clang/include" # source dir
+ )
+ endif()
+
+ message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+ message(STATUS " Include dirs: ${CLANG_INCLUDE_DIRS}")
+ message(STATUS " Clang libraries: ${CLANG_LIBS}")
+ message(STATUS " Libclang C library: ${CLANG_LIBCLANG_LIB}")
+else()
+ if(Clang_FIND_REQUIRED)
+ message(FATAL_ERROR "Could NOT find Clang")
+ endif()
+endif()
diff --git a/find-modules/FindLLVM.cmake b/find-modules/FindLLVM.cmake
new file mode 100644
index 0000000..2d6085e
--- /dev/null
+++ b/find-modules/FindLLVM.cmake
@@ -0,0 +1,157 @@
+# Find the native LLVM includes and libraries
+#
+# Defines the following variables
+# LLVM_INCLUDE_DIRS - where to find llvm include files
+# LLVM_LIBRARY_DIRS - where to find llvm libs
+# LLVM_CFLAGS - llvm compiler flags
+# LLVM_LFLAGS - llvm linker flags
+# LLVM_MODULE_LIBS - list of llvm libs for working with modules.
+# LLVM_INSTALL_PREFIX - LLVM installation prefix
+# LLVM_FOUND - True if llvm found.
+# LLVM_VERSION - Version string ("llvm-config --version")
+#
+# This module reads hints about search locations from variables
+# LLVM_ROOT - Preferred LLVM installation prefix (containing bin/,
lib/, ...)
+#
+# Note: One may specify these as environment variables if they are not
specified as
+# CMake variables or cache entries.
+
+#=============================================================================
+# Copyright 2014 Kevin Funk <[email protected]>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+ file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+endif()
+
+# if the user specified LLVM_ROOT, use that and fail otherwise
+if (LLVM_ROOT)
+ find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin
DOC "llvm-config executable" NO_DEFAULT_PATH)
+elseif (NOT LLVM_CONFIG_EXECUTABLE)
+ # find llvm-config, prefer the one with a version suffix, e.g.
llvm-config-3.5
+ # note: FreeBSD installs llvm-config as llvm-config35 and so on
+ # note: on some distributions, only 'llvm-config' is shipped, so let's
always try to fallback on that
+ string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+ find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION}
llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+
+ # other distributions don't ship llvm-config, but only some
llvm-config-VERSION binary
+ # try to deduce installed LLVM version by looking up llvm-nm in PATH and
*then* find llvm-config-VERSION via that
+ if (NOT LLVM_CONFIG_EXECUTABLE)
+ find_program(_llvmNmExecutable llvm-nm)
+ if (_llvmNmExecutable)
+ execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE
_out)
+ string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString
"${_out}")
+ find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString}
DOC "llvm-config executable")
+ endif()
+ endif()
+endif()
+
+set(LLVM_FOUND FALSE)
+
+if (LLVM_CONFIG_EXECUTABLE)
+ # verify that we've found the correct version of llvm-config
+ execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+ OUTPUT_VARIABLE LLVM_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ if (NOT LLVM_VERSION)
+ set(_LLVM_ERROR_MESSAGE "Failed to parse version from
${LLVM_CONFIG_EXECUTABLE}")
+ unset(LLVM_CONFIG_EXECUTABLE CACHE)
+ elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+ set(_LLVM_ERROR_MESSAGE "${LLVM_CONFIG_EXECUTABLE} (version
${LLVM_VERSION}) unsuitable: too old for requested version
${LLVM_FIND_VERSION}")
+ unset(LLVM_CONFIG_EXECUTABLE CACHE)
+ else()
+ set(LLVM_FOUND TRUE)
+ endif()
+else()
+ set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+endif()
+
+if (LLVM_FOUND)
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+ OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+ OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+ OUTPUT_VARIABLE LLVM_CFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+ OUTPUT_VARIABLE LLVM_LFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+ OUTPUT_VARIABLE LLVM_MODULE_LIBS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+ OUTPUT_VARIABLE LLVM_LIBS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+ OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ if (NOT ${LLVM_VERSION} VERSION_LESS "3.8.0")
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --shared-mode
+ OUTPUT_VARIABLE _LLVM_SHARED_MODE
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ if (_LLVM_SHARED_MODE STREQUAL "shared")
+ set(LLVM_SHARED_MODE ON)
+ else()
+ set(LLVM_SHARED_MODE OFF)
+ endif()
+ else()
+ set(LLVM_SHARED_MODE OFF)
+ endif()
+
+ # potentially add include dir from binary dir for non-installed LLVM
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+ OUTPUT_VARIABLE _llvmSourceRoot
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+ if (NOT _llvmIsInstalled)
+ list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+ endif()
+endif()
+
+if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+ message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+elseif(_LLVM_ERROR_MESSAGE)
+ message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+endif()
+
+if (LLVM_FOUND)
+ message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using
${LLVM_CONFIG_EXECUTABLE})")
+ message(STATUS " Include dirs: ${LLVM_INCLUDE_DIRS}")
+ message(STATUS " LLVM libraries: ${LLVM_LIBS}")
+endif()
diff --git a/find-modules/FindPythonModuleGeneration.cmake
b/find-modules/FindPythonModuleGeneration.cmake
index 012f806..7129b96 100644
--- a/find-modules/FindPythonModuleGeneration.cmake
+++ b/find-modules/FindPythonModuleGeneration.cmake
@@ -179,28 +179,14 @@ if (NOT GPB_PYTHON2_COMMAND)
endif()
if (NOT libclang_LIBRARY)
- set(_LIBCLANG_MAX_MAJOR_VERSION 7)
- set(_LIBCLANG_MIN_MAJOR_VERSION 4)
-
- find_library(libclang_LIBRARY clang-${_LIBCLANG_MAX_MAJOR_VERSION}.0)
-
- if (libclang_LIBRARY)
- message(FATAL_ERROR "The max libclang version in
${CMAKE_FIND_PACKAGE_NAME} must be updated.")
- endif()
-
- set(_LIBCLANG_FIND_VERSION ${_LIBCLANG_MAX_MAJOR_VERSION})
- while(NOT libclang_LIBRARY AND NOT _LIBCLANG_FIND_VERSION EQUAL
_LIBCLANG_MIN_MAJOR_VERSION)
- math(EXPR _LIBCLANG_FIND_VERSION "${_LIBCLANG_FIND_VERSION} - 1")
- set(_GPB_CLANG_SUFFIX ${_LIBCLANG_FIND_VERSION}.0)
- find_library(libclang_LIBRARY clang-${_LIBCLANG_FIND_VERSION}.0)
- endwhile()
+ find_package(Clang 3.8)
+ set_package_properties(Clang PROPERTIES
+ DESCRIPTION "Clang C library: libclang"
+ PURPOSE "Needed to generate the Python bindings for KDE Frameworks"
+ TYPE REQUIRED
+ )
- if (NOT libclang_LIBRARY)
- find_library(libclang_LIBRARY clang-3.9)
- if (NOT libclang_LIBRARY)
- find_library(libclang_LIBRARY clang-3.8)
- endif()
- endif()
+ set(libclang_LIBRARY ${CLANG_LIBCLANG_LIB})
else()
string(REGEX MATCH ".*clang-([0-9]+\\.[0-9]+).*" _GPB_CLANG_SUFFIX
${libclang_LIBRARY})
set(_GPB_CLANG_SUFFIX ${CMAKE_MATCH_1})
--
2.12.0
++++++ extra-cmake-modules-5.32.0.tar.xz -> extra-cmake-modules-5.33.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.32.0/CMakeLists.txt
new/extra-cmake-modules-5.33.0/CMakeLists.txt
--- old/extra-cmake-modules-5.32.0/CMakeLists.txt 2017-02-15
09:14:57.000000000 +0100
+++ new/extra-cmake-modules-5.33.0/CMakeLists.txt 2017-03-19
09:53:58.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.32.0") # handled by release scripts
+set(VERSION "5.33.0") # handled by release scripts
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.32.0/kde-modules/KDECMakeSettings.cmake
new/extra-cmake-modules-5.33.0/kde-modules/KDECMakeSettings.cmake
--- old/extra-cmake-modules-5.32.0/kde-modules/KDECMakeSettings.cmake
2017-02-15 09:14:57.000000000 +0100
+++ new/extra-cmake-modules-5.33.0/kde-modules/KDECMakeSettings.cmake
2017-03-19 09:53:58.000000000 +0100
@@ -237,22 +237,23 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
endif()
- # Disable detection of X11 and related package on OS X because when using
- # brew or macports, X11 can be installed and thus is detected.
- option(APPLE_FORCE_X11 "Force enable X11 related detection on OS X" OFF)
- option(APPLE_SUPPRESS_X11_WARNING "Suppress X11 and related technologies
search disabling warning on OS X" OFF)
+ if (APPLE)
+ # Disable detection of X11 and related package on OS X because when
using
+ # brew or macports, X11 can be installed and thus is detected.
+ option(APPLE_FORCE_X11 "Force enable X11 related detection on OS X" OFF)
+ option(APPLE_SUPPRESS_X11_WARNING "Suppress X11 and related
technologies search disabling warning on OS X" OFF)
- if(APPLE AND NOT APPLE_FORCE_X11)
- if (NOT APPLE_SUPPRESS_X11_WARNING)
- message(WARNING "Searching for X11 and related technologies is
disabled on Apple systems. Set APPLE_FORCE_X11 to ON to change this behaviour.
Set APPLE_SUPPRESS_X11_WARNING to ON to hide this warning.")
- endif()
+ if(NOT APPLE_FORCE_X11)
+ if (NOT APPLE_SUPPRESS_X11_WARNING)
+ message(WARNING "Searching for X11 and related technologies is
disabled on Apple systems. Set APPLE_FORCE_X11 to ON to change this behaviour.
Set APPLE_SUPPRESS_X11_WARNING to ON to hide this warning.")
+ endif()
+ set(CMAKE_DISABLE_FIND_PACKAGE_X11 true)
+ set(CMAKE_DISABLE_FIND_PACKAGE_XCB true)
+ set(CMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras true)
+ endif()
+ endif()
- set(CMAKE_DISABLE_FIND_PACKAGE_X11 true)
- set(CMAKE_DISABLE_FIND_PACKAGE_XCB true)
- set(CMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras true)
- endif()
-
- option(KDE_SKIP_UNINSTALL_TARGET "Prevent an \"uninstall\" target from
being generated." OFF)
+ option(KDE_SKIP_UNINSTALL_TARGET "Prevent an \"uninstall\" target from
being generated." OFF)
if(NOT KDE_SKIP_UNINSTALL_TARGET)
include("${ECM_MODULE_DIR}/ECMUninstallTarget.cmake")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.32.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-5.33.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-5.32.0/kde-modules/KDECompilerSettings.cmake
2017-02-15 09:14:57.000000000 +0100
+++ new/extra-cmake-modules-5.33.0/kde-modules/KDECompilerSettings.cmake
2017-03-19 09:53:58.000000000 +0100
@@ -100,7 +100,7 @@
else()
_kde_compiler_min_version("4.5")
endif()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID
STREQUAL "AppleClang")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
_kde_compiler_min_version("3.1")
else()
message(WARNING "${CMAKE_CXX_COMPILER_ID} is not a supported C++
compiler.")
@@ -189,12 +189,12 @@
# Pick sensible versions of the C and C++ standards.
# Note that MSVC does not have equivalent flags; the features are either
# supported or they are not.
-if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
# We use the C89 standard because that is what is common to all our
# compilers (in particular, MSVC 2010 does not support C99)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990")
endif()
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL
"Clang")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
@@ -206,7 +206,7 @@
# See
https://www.ibm.com/developerworks/community/blogs/zTPF/entry/benefits_of_the_fnocommon_compile_option_peter_lemieszewski?lang=en
# Note that this only applies to C code; C++ already behaves like this.
if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
- CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
+ CMAKE_C_COMPILER_ID MATCHES "Clang" OR
(CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common")
endif()
@@ -214,7 +214,7 @@
# Do not treat the operator name keywords and, bitand, bitor, compl, not, or
and xor as synonyms as keywords.
# They're not supported under Visual Studio out of the box thus using them
limits the portability of code
if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
- CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
+ CMAKE_C_COMPILER_ID MATCHES "Clang" OR
(CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-operator-names")
endif()
@@ -263,7 +263,7 @@
# Turn off exceptions by default
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
@@ -285,7 +285,7 @@
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(${VAR} "${${VAR}} -fexceptions")
- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(${VAR} "${${VAR}} -fexceptions")
endif()
string(STRIP "${${VAR}}" ${VAR})
@@ -353,12 +353,12 @@
endif()
set(_KDE_GCC_COMMON_WARNING_FLAGS "-Wall -Wextra -Wcast-align
-Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith -Wundef")
-if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_KDE_GCC_COMMON_WARNING_FLAGS}
-Wmissing-format-attribute -Wwrite-strings")
# Make some warnings errors
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
endif()
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL
"Clang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_KDE_GCC_COMMON_WARNING_FLAGS}
-Wnon-virtual-dtor -Woverloaded-virtual")
# Make some warnings errors
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.32.0/kde-modules/KDEFrameworkCompilerSettings.cmake
new/extra-cmake-modules-5.33.0/kde-modules/KDEFrameworkCompilerSettings.cmake
---
old/extra-cmake-modules-5.32.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2017-02-15 09:14:57.000000000 +0100
+++
new/extra-cmake-modules-5.33.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2017-03-19 09:53:58.000000000 +0100
@@ -66,7 +66,7 @@
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
endif()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# -Wgnu-zero-variadic-macro-arguments is triggered by every qCDebug() call
and therefore results
# in a lot of noise. This warning is only notifying us that clang is
emulating the GCC behaviour
# instead of the exact standard wording so we can safely ignore it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.32.0/modules/ECMGeneratePkgConfigFile.cmake
new/extra-cmake-modules-5.33.0/modules/ECMGeneratePkgConfigFile.cmake
--- old/extra-cmake-modules-5.32.0/modules/ECMGeneratePkgConfigFile.cmake
2017-02-15 09:14:57.000000000 +0100
+++ new/extra-cmake-modules-5.33.0/modules/ECMGeneratePkgConfigFile.cmake
2017-03-19 09:53:58.000000000 +0100
@@ -160,11 +160,11 @@
file(WRITE ${PKGCONFIG_FILENAME}
"
-Name: @PKGCONFIG_TARGET_LIBNAME@
-Version: @PROJECT_VERSION@
-Libs: -L@CMAKE_INSTALL_PREFIX@/@EGPF_LIB_INSTALL_DIR@
-l@PKGCONFIG_TARGET_LIBNAME@
-Cflags: @PKGCONFIG_TARGET_INCLUDES@ @PKGCONFIG_TARGET_DEFINES@
-Requires: @PKGCONFIG_TARGET_DEPS@
+Name: ${PKGCONFIG_TARGET_LIBNAME}
+Version: ${PROJECT_VERSION}
+Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}
-l${PKGCONFIG_TARGET_LIBNAME}
+Cflags: ${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES}
+Requires: ${PKGCONFIG_TARGET_DEPS}
"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.32.0/toolchain/Android.cmake
new/extra-cmake-modules-5.33.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.32.0/toolchain/Android.cmake 2017-02-15
09:14:57.000000000 +0100
+++ new/extra-cmake-modules-5.33.0/toolchain/Android.cmake 2017-03-19
09:53:58.000000000 +0100
@@ -160,6 +160,9 @@
SET(CMAKE_SYSTEM_NAME Android)
SET(CMAKE_SYSTEM_VERSION 1)
+if (NOT DEFINED ECM_ADDITIONAL_FIND_ROOT_PATH)
+ SET(ECM_ADDITIONAL_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH})
+endif()
SET(CMAKE_FIND_ROOT_PATH ${ANDROID_NDK} ${ECM_ADDITIONAL_FIND_ROOT_PATH})
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
@@ -213,6 +216,7 @@
# needed for Qt to define Q_OS_ANDROID
add_definitions(-DANDROID)
+set(ECM_DIR "${CMAKE_CURRENT_LIST_DIR}/.." CACHE STRING "")
######### generation
@@ -221,8 +225,10 @@
# from CMakeDetermineSystem.cmake and from CMakeSystem.cmake generated within
the
# build directory.
if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME})
- if(NOT EXISTS "${ANDROID_APK_DIR}/AndroidManifest.xml")
+ if(NOT DEFINED ANDROID_APK_DIR)
message(FATAL_ERROR "Define an apk dir to initialize from using
-DANDROID_APK_DIR=<path>. The specified directory must contain the
AndroidManifest.xml file.")
+ elseif(NOT EXISTS "${ANDROID_APK_DIR}/AndroidManifest.xml")
+ message(FATAL_ERROR "Cannot find
${ANDROID_APK_DIR}/AndroidManifest.xml according to ANDROID_APK_DIR")
endif()
find_package(Qt5Core REQUIRED)
@@ -239,6 +245,10 @@
COMMAND cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled "\\$(ARGS)"
)
+
+ add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET}
+ COMMAND adb install -r "${EXPORT_DIR}/bin/QtApp-debug.apk"
+ )
else()
message(STATUS "You can export a target by specifying
-DQTANDROID_EXPORTED_TARGET=<targetname>")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.32.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.33.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.32.0/toolchain/deployment-file.json.in
2017-02-15 09:14:57.000000000 +0100
+++ new/extra-cmake-modules-5.33.0/toolchain/deployment-file.json.in
2017-03-19 09:53:58.000000000 +0100
@@ -8,6 +8,7 @@
"ndk-host": "@_HOST@",
"target-architecture": "@ANDROID_ABI@",
"application-binary": "@EXECUTABLE_DESTINATION_PATH@",
+ "qml-root-path": "@CMAKE_INSTALL_PREFIX@/share",
##EXTRALIBS##
##EXTRAPLUGINS##
"android-package-source-directory": "@ANDROID_APK_DIR@",
