Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2015-03-16 09:26:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2015-02-16 17:25:22.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2015-03-16 09:26:35.000000000 +0100
@@ -1,0 +2,8 @@
+Sat Mar 7 16:58:31 UTC 2015 - [email protected]
+
+- Update to 5.8.0
+ * Extend ecm_generate_headers macro to also support CamelCase.h headers
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.8.0.php
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-1.7.0.tar.xz
New:
----
extra-cmake-modules-1.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.wPlhul/_old 2015-03-16 09:26:36.000000000 +0100
+++ /var/tmp/diff_new_pack.wPlhul/_new 2015-03-16 09:26:36.000000000 +0100
@@ -21,9 +21,9 @@
License: BSD-3-Clause
Group: Development/Tools/Other
Url:
https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-Version: 1.7.0
+Version: 1.8.0
Release: 0
-Source:
http://download.kde.org/stable/frameworks/5.7/%{name}-%{version}.tar.xz
+Source:
http://download.kde.org/stable/frameworks/5.8/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 2.8.12
BuildRequires: gcc-c++
++++++ extra-cmake-modules-1.7.0.tar.xz -> extra-cmake-modules-1.8.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.7.0/CMakeLists.txt
new/extra-cmake-modules-1.8.0/CMakeLists.txt
--- old/extra-cmake-modules-1.7.0/CMakeLists.txt 2015-02-06
15:00:52.000000000 +0100
+++ new/extra-cmake-modules-1.8.0/CMakeLists.txt 2015-03-06
12:14:56.000000000 +0100
@@ -3,7 +3,7 @@
project(extra-cmake-modules NONE)
set(ECM_MAJOR_VERSION 1)
-set(ECM_MINOR_VERSION 7)
+set(ECM_MINOR_VERSION 8)
set(ECM_PATCH_VERSION 0)
set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.7.0/find-modules/FindQtWaylandScanner.cmake
new/extra-cmake-modules-1.8.0/find-modules/FindQtWaylandScanner.cmake
--- old/extra-cmake-modules-1.7.0/find-modules/FindQtWaylandScanner.cmake
2015-02-06 15:00:52.000000000 +0100
+++ new/extra-cmake-modules-1.8.0/find-modules/FindQtWaylandScanner.cmake
2015-03-06 12:14:56.000000000 +0100
@@ -90,7 +90,7 @@
ecm_find_package_version_check(QtWaylandScanner)
# Find qtwaylandscanner
-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner)
+find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(QtWaylandScanner
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.7.0/modules/ECMCreateQmFromPoFiles.cmake
new/extra-cmake-modules-1.8.0/modules/ECMCreateQmFromPoFiles.cmake
--- old/extra-cmake-modules-1.7.0/modules/ECMCreateQmFromPoFiles.cmake
2015-02-06 15:00:52.000000000 +0100
+++ new/extra-cmake-modules-1.8.0/modules/ECMCreateQmFromPoFiles.cmake
2015-03-06 12:14:56.000000000 +0100
@@ -110,13 +110,18 @@
function(_ECM_QM_CREATE_TARGET install_destination catalog_name)
# Find lconvert
- get_target_property(lrelease_location Qt5::lrelease LOCATION)
- get_filename_component(lrelease_path ${lrelease_location} PATH)
- find_program(lconvert_executable
- NAMES lconvert-qt5 lconvert
- PATHS ${lrelease_path}
- NO_DEFAULT_PATH
- )
+ if(TARGET Qt5::lconvert)
+ set(lconvert_executable Qt5::lconvert)
+ else()
+ # Qt < 5.3.1 does not define Qt5::lconvert
+ get_target_property(lrelease_location Qt5::lrelease LOCATION)
+ get_filename_component(lrelease_path ${lrelease_location} PATH)
+ find_program(lconvert_executable
+ NAMES lconvert-qt5 lconvert
+ PATHS ${lrelease_path}
+ NO_DEFAULT_PATH
+ )
+ endif()
if (catalog_name)
set(install_args RENAME ${catalog_name}.qm)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.7.0/modules/ECMGenerateHeaders.cmake
new/extra-cmake-modules-1.8.0/modules/ECMGenerateHeaders.cmake
--- old/extra-cmake-modules-1.7.0/modules/ECMGenerateHeaders.cmake
2015-02-06 15:00:52.000000000 +0100
+++ new/extra-cmake-modules-1.8.0/modules/ECMGenerateHeaders.cmake
2015-03-06 12:14:56.000000000 +0100
@@ -6,26 +6,31 @@
#
# ::
#
-# ecm_generate_headers(<camelcase_headers_var>
-# HEADER_NAMES <CamelCaseHeader> [<CamelCaseHeader> [...]]
+# ecm_generate_headers(<camelcase_forwarding_headers_var>
+# HEADER_NAMES <CamelCaseName> [<CamelCaseName> [...]]
+# [ORIGINAL <CAMELCASE|LOWERCASE>]
# [OUTPUT_DIR <output_dir>]
# [PREFIX <prefix>]
# [REQUIRED_HEADERS <variable>]
# [RELATIVE <relative_path>])
#
# For each CamelCase header name passed to HEADER_NAMES, a file of that name
-# will be generated that will include a lowercased version with ``.h``
appended.
-# For example, the header ``ClassA`` will include ``classa.h``. The file
-# locations of these generated headers will be stored in
-# <camelcase_headers_var>.
-#
-# PREFIX places the headers in subdirectories. This should be a CamelCase name
-# like KParts, which will cause the CamelCase headers to be placed in the
KParts
-# directory (eg: KParts/Part). It will also, for the convenience of code in
the
-# source distribution, generate forwarding lowercase headers, like
-# kparts/part.h. This allows includes like "#include <kparts/part.h>" to be
-# used before installation, as long as the include_directories are set
-# appropriately.
+# will be generated that will include a version with ``.h`` appended.
+# For example, the generated header ``ClassA`` will include ``classa.h`` (or
+# ``ClassA.h``, see ORIGINAL).
+# The file locations of these generated headers will be stored in
+# <camelcase_forwarding_headers_var>.
+#
+# ORIGINAL specifies how the name of the original header is written: lowercased
+# or also camelcased. The default is LOWERCASE. Since 1.8.0.
+#
+# PREFIX places the generated headers in subdirectories. This should be a
+# CamelCase name like ``KParts``, which will cause the CamelCase forwarding
+# headers to be placed in the ``KParts`` directory (e.g. ``KParts/Part``). It
+# will also, for the convenience of code in the source distribution, generate
+# forwarding headers based on the original names (e.g. ``kparts/part.h``).
This
+# allows includes like ``"#include <kparts/part.h>"`` to be used before
+# installation, as long as the include_directories are set appropriately.
#
# OUTPUT_DIR specifies where the files will be generated; this should be within
# the build directory. By default, ``${CMAKE_CURRENT_BINARY_DIR}`` will be
used.
@@ -35,14 +40,14 @@
# headers will be appended so that they can be installed together with the
# generated ones. This is mostly intended as a convenience so that adding a
new
# header to a project only requires specifying the CamelCase variant in the
-# CMakeLists.txt file; the lowercase variant will then be added to this
+# CMakeLists.txt file; the original variant will then be added to this
# variable.
#
-# The RELATIVE argument indicates where the lowercase headers can be found
+# The RELATIVE argument indicates where the original headers can be found
# relative to CMAKE_CURRENT_SOURCE_DIR. It does not affect the generated
-# CamelCase files, but ecm_generate_headers() uses it when checking that the
-# lowercase header exists, and to generate lowercase forwarding headers when
-# PREFIX is set.
+# CamelCase forwarding files, but ecm_generate_headers() uses it when checking
+# that the original header exists, and to generate originally named forwarding
+# headers when PREFIX is set.
#
# To allow other parts of the source distribution (eg: tests) to use the
# generated headers before installation, it may be desirable to set the
@@ -107,9 +112,9 @@
include(CMakeParseArguments)
-function(ECM_GENERATE_HEADERS camelcase_headers_var)
+function(ECM_GENERATE_HEADERS camelcase_forwarding_headers_var)
set(options)
- set(oneValueArgs OUTPUT_DIR PREFIX REQUIRED_HEADERS RELATIVE)
+ set(oneValueArgs ORIGINAL OUTPUT_DIR PREFIX REQUIRED_HEADERS RELATIVE)
set(multiValueArgs HEADER_NAMES)
cmake_parse_arguments(EGH "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
@@ -121,6 +126,14 @@
message(FATAL_ERROR "Missing header_names argument to
ECM_GENERATE_HEADERS")
endif()
+ if(NOT EGH_ORIGINAL)
+ # default
+ set(EGH_ORIGINAL "LOWERCASE")
+ endif()
+ if(NOT EGH_ORIGINAL STREQUAL "LOWERCASE" AND NOT EGH_ORIGINAL STREQUAL
"CAMELCASE")
+ message(FATAL_ERROR "Unexpected value for original argument to
ECM_GENERATE_HEADERS: ${EGH_ORIGINAL}")
+ endif()
+
if(NOT EGH_OUTPUT_DIR)
set(EGH_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
endif()
@@ -134,33 +147,41 @@
if (NOT "${EGH_PREFIX}" MATCHES "^.*/$")
set(EGH_PREFIX "${EGH_PREFIX}/")
endif()
- string(TOLOWER "${EGH_PREFIX}" lowercaseprefix)
+ if (EGH_ORIGINAL STREQUAL "CAMELCASE")
+ set(originalprefix "${EGH_PREFIX}")
+ else()
+ string(TOLOWER "${EGH_PREFIX}" originalprefix)
+ endif()
endif()
foreach(_CLASSNAME ${EGH_HEADER_NAMES})
- string(TOLOWER "${_CLASSNAME}" lowercaseclassname)
+ if (EGH_ORIGINAL STREQUAL "CAMELCASE")
+ set(originalclassname "${_CLASSNAME}")
+ else()
+ string(TOLOWER "${_CLASSNAME}" originalclassname)
+ endif()
set(FANCY_HEADER_FILE "${EGH_OUTPUT_DIR}/${EGH_PREFIX}${_CLASSNAME}")
- set(_actualheader
"${CMAKE_CURRENT_SOURCE_DIR}/${EGH_RELATIVE}${lowercaseclassname}.h")
+ set(_actualheader
"${CMAKE_CURRENT_SOURCE_DIR}/${EGH_RELATIVE}${originalclassname}.h")
if (NOT EXISTS ${_actualheader})
message(FATAL_ERROR "Could not find \"${_actualheader}\"")
endif()
if (NOT EXISTS ${FANCY_HEADER_FILE})
- file(WRITE ${FANCY_HEADER_FILE} "#include
\"${lowercaseprefix}${lowercaseclassname}.h\"\n")
+ file(WRITE ${FANCY_HEADER_FILE} "#include
\"${originalprefix}${originalclassname}.h\"\n")
endif()
- list(APPEND ${camelcase_headers_var} "${FANCY_HEADER_FILE}")
+ list(APPEND ${camelcase_forwarding_headers_var} "${FANCY_HEADER_FILE}")
if (EGH_REQUIRED_HEADERS)
list(APPEND ${EGH_REQUIRED_HEADERS} "${_actualheader}")
endif()
if (EGH_PREFIX)
# Local forwarding header, for namespaced headers, e.g.
kparts/part.h
- set(REGULAR_HEADER_NAME
${EGH_OUTPUT_DIR}/${lowercaseprefix}${lowercaseclassname}.h)
+ set(REGULAR_HEADER_NAME
${EGH_OUTPUT_DIR}/${originalprefix}${originalclassname}.h)
if (NOT EXISTS ${REGULAR_HEADER_NAME})
file(WRITE ${REGULAR_HEADER_NAME} "#include
\"${_actualheader}\"\n")
endif()
endif()
endforeach()
- set(${camelcase_headers_var} ${${camelcase_headers_var}} PARENT_SCOPE)
+ set(${camelcase_forwarding_headers_var}
${${camelcase_forwarding_headers_var}} PARENT_SCOPE)
if (NOT EGH_REQUIRED_HEADERS STREQUAL "")
set(${EGH_REQUIRED_HEADERS} ${${EGH_REQUIRED_HEADERS}} PARENT_SCOPE)
endif ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.7.0/modules/ECMPackageConfigHelpers.cmake
new/extra-cmake-modules-1.8.0/modules/ECMPackageConfigHelpers.cmake
--- old/extra-cmake-modules-1.7.0/modules/ECMPackageConfigHelpers.cmake
2015-02-06 15:00:52.000000000 +0100
+++ new/extra-cmake-modules-1.8.0/modules/ECMPackageConfigHelpers.cmake
2015-03-06 12:14:56.000000000 +0100
@@ -5,7 +5,9 @@
# Helper macros for generating CMake package config files.
#
# ``write_basic_package_version_file()`` is the same as the one provided by the
-# CMakePackageConfigHelpers module in CMake; see that module's documentation
for
+# `CMakePackageConfigHelpers
+#
<http://www.cmake.org/cmake/help/v2.8.12/cmake.html#module:CMakePackageConfigHelpers>`_
+# module in CMake; see that module's documentation for
# more information.
#
# ::
@@ -18,7 +20,23 @@
#
#
# This behaves in the same way as configure_package_config_file() from CMake
-# 2.8.12, except that it adds an extra helper macro: find_dependency().
+# 2.8.12, except that it adds an extra helper macro: find_dependency(). It is
+# highly recommended that you read the `documentation for
+# CMakePackageConfigHelpers
+#
<http://www.cmake.org/cmake/help/v2.8.12/cmake.html#module:CMakePackageConfigHelpers>`_
+# for more information, particularly with regard to the PATH_VARS argument.
+#
+# Note that there is no argument that will disable the find_dependency() macro;
+# if you do not require this macro, you should use
+# ``configure_package_config_file`` from the CMakePackageConfigHelpers module.
+#
+# CMake 3.0 includes a CMakeFindDependencyMacro module that provides the
+# find_dependency() macro (which you can ``include()`` in your package config
+# file), so this file is only useful for projects wishing to provide config
+# files that will work with CMake 2.8.12.
+#
+# Additional Config File Macros
+# =============================
#
# ::
#
@@ -29,15 +47,6 @@
# REQUIRED which were passed to the original find_package() call. It also sets
# an informative diagnostic message if the dependency could not be found.
#
-# Note that there is no argument to disable the find_dependency() macro; if you
-# do not require this macro, you should just use the CMakeFindDependencyMacro
-# module directly.
-#
-# CMake 3.0.0 will include a CMakeFindDependencyMacro module that will provide
-# the find_dependency() macro (which you can include() in your package config
-# file), so this file is only useful for projects whose minimum required
version
-# is 2.8.12.
-#
# Since pre-1.0.0.
#=============================================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.7.0/modules/ECMPoQmTools.cmake
new/extra-cmake-modules-1.8.0/modules/ECMPoQmTools.cmake
--- old/extra-cmake-modules-1.7.0/modules/ECMPoQmTools.cmake 2015-02-06
15:00:52.000000000 +0100
+++ new/extra-cmake-modules-1.8.0/modules/ECMPoQmTools.cmake 2015-03-06
12:14:56.000000000 +0100
@@ -121,18 +121,20 @@
endif()
# Find lrelease and lconvert
-
- # This gives us Qt5::lrelease but unfortunately no Qt5::lconvert See
- # https://bugreports.qt-project.org/browse/QTBUG-37937
find_package(Qt5LinguistTools CONFIG REQUIRED)
- get_target_property(lrelease_location Qt5::lrelease LOCATION)
- get_filename_component(lrelease_path ${lrelease_location} PATH)
- find_program(lconvert_executable
- NAMES lconvert-qt5 lconvert
- PATHS ${lrelease_path}
- NO_DEFAULT_PATH
- )
+ if(TARGET Qt5::lconvert)
+ set(lconvert_executable Qt5::lconvert)
+ else()
+ # Qt < 5.3.1 does not define Qt5::lconvert
+ get_target_property(lrelease_location Qt5::lrelease LOCATION)
+ get_filename_component(lrelease_path ${lrelease_location} PATH)
+ find_program(lconvert_executable
+ NAMES lconvert-qt5 lconvert
+ PATHS ${lrelease_path}
+ NO_DEFAULT_PATH
+ )
+ endif()
# Create commands to turn po files into qm files
set(qm_files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.7.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
new/extra-cmake-modules-1.8.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
---
old/extra-cmake-modules-1.7.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
2015-02-06 15:00:52.000000000 +0100
+++
new/extra-cmake-modules-1.8.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
2015-03-06 12:14:56.000000000 +0100
@@ -244,4 +244,49 @@
ORIGINALS ${origfiles})
+###########################################################
+
+message(STATUS "Test 10: ORIGINAL CAMELCASE")
+set(forward_headers)
+set(expfiles "${CMAKE_CURRENT_BINARY_DIR}/CamelCaseHeadTest1"
+ "${CMAKE_CURRENT_BINARY_DIR}/CamelCaseHeadTest2")
+set(origfiles CamelCaseHeadTest1.h CamelCaseHeadTest2.h)
+file(REMOVE ${expfiles})
+ecm_generate_headers(
+ forward_headers
+ ORIGINAL CAMELCASE
+ HEADER_NAMES CamelCaseHeadTest1 CamelCaseHeadTest2
+)
+if (NOT "${expfiles}" STREQUAL "${forward_headers}")
+ message(FATAL_ERROR "forward_headers was set to \"${forward_headers}\"
instead of \"${expfiles}\"")
+endif()
+check_files(GENERATED ${expfiles}
+ ORIGINALS ${origfiles})
+
+
+###########################################################
+
+message(STATUS "Test 11: PREFIX and ORIGINAL CAMELCASE")
+set(forward_headers)
+set(expfiles "${CMAKE_CURRENT_BINARY_DIR}/Module/CamelCaseHeadTest1"
+ "${CMAKE_CURRENT_BINARY_DIR}/Module/CamelCaseHeadTest2")
+set(intermediatefiles Module/CamelCaseHeadTest1.h Module/CamelCaseHeadTest2.h)
+set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/headtest1.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/headtest2.h")
+file(REMOVE ${expfiles} ${intermediatefiles})
+ecm_generate_headers(
+ forward_headers
+ ORIGINAL CAMELCASE
+ HEADER_NAMES CamelCaseHeadTest1 CamelCaseHeadTest2
+ PREFIX Module
+)
+if (NOT "${expfiles}" STREQUAL "${forward_headers}")
+ message(FATAL_ERROR "forward_headers was set to \"${forward_headers}\"
instead of \"${expfiles}\"")
+endif()
+check_files(GENERATED ${expfiles}
+ ORIGINALS ${intermediatefiles})
+check_files(GENERATED ${expfiles}
+ ORIGINALS ${intermediatefiles})
+
+
# vim:ft=cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.7.0/toolchain/Android.cmake
new/extra-cmake-modules-1.8.0/toolchain/Android.cmake
--- old/extra-cmake-modules-1.7.0/toolchain/Android.cmake 2015-02-06
15:00:52.000000000 +0100
+++ new/extra-cmake-modules-1.8.0/toolchain/Android.cmake 2015-03-06
12:14:56.000000000 +0100
@@ -161,6 +161,9 @@
######### generation
set(CREATEAPK_TARGET_NAME "create-apk-${QTANDROID_EXPORTED_TARGET}")
+# Need to ensure we only get in here once, as this file is included twice:
+# 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")
message(FATAL_ERROR "Define an apk dir to initialize from using
-DANDROID_APK_DIR=<path>. The specified directory must contain the
AndroidManifest.xml file.")
@@ -184,6 +187,8 @@
string(REPLACE ";" "," _DEPS "${_DEPS_LIST}")
configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${QTANDROID_EXPORTED_TARGET}-deployment.json")
endfunction()
+ #we want to call the function after the project has been set up
+ variable_watch(CMAKE_PARENT_LIST_FILE EOFHook)
# Create the target that will eventually generate the apk
get_filename_component(QTDIR "${Qt5Core_DIR}/../../../" ABSOLUTE)
@@ -197,9 +202,6 @@
COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
COMMAND ${ANDROID_DEPLOY_QT} --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled "\\$(ARGS)"
)
-
- #we want to call the function after the project has been set up
- variable_watch(CMAKE_PARENT_LIST_FILE EOFHook)
else()
message(STATUS "You can export a target by specifying
-DQTANDROID_EXPORTED_TARGET=<targetname>")
endif()
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
