Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2014-12-21 11:58:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-11-11 01:10:53.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2014-12-21 11:57:14.000000000 +0100
@@ -1,0 +2,10 @@
+Sat Dec 6 12:53:48 UTC 2014 - [email protected]
+
+- Update to 1.5.0
+ * Set CMAKE_INSTALL_SYSCONFDIR to /etc when CMAKE_INSTALL_PREFIX
+ is /usr (instead of /usr/etc)
+ * Enable -D_USE_MATH_DEFINES on Windows
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.5.0.php
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-1.4.0.tar.xz
New:
----
extra-cmake-modules-1.5.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.UCjbUG/_old 2014-12-21 11:57:15.000000000 +0100
+++ /var/tmp/diff_new_pack.UCjbUG/_new 2014-12-21 11:57:15.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.4.0
+Version: 1.5.0
Release: 0
-Source:
http://download.kde.org/stable/frameworks/5.4/%{name}-%{version}.tar.xz
+Source:
http://download.kde.org/stable/frameworks/5.5/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 2.8.12
BuildRequires: gcc-c++
++++++ extra-cmake-modules-1.4.0.tar.xz -> extra-cmake-modules-1.5.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.4.0/CMakeLists.txt
new/extra-cmake-modules-1.5.0/CMakeLists.txt
--- old/extra-cmake-modules-1.4.0/CMakeLists.txt 2014-10-23
14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/CMakeLists.txt 2014-11-14
19:20:50.000000000 +0100
@@ -3,7 +3,7 @@
project(extra-cmake-modules NONE)
set(ECM_MAJOR_VERSION 1)
-set(ECM_MINOR_VERSION 4)
+set(ECM_MINOR_VERSION 5)
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.4.0/find-modules/FindEGL.cmake
new/extra-cmake-modules-1.5.0/find-modules/FindEGL.cmake
--- old/extra-cmake-modules-1.4.0/find-modules/FindEGL.cmake 2014-10-23
14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/find-modules/FindEGL.cmake 2014-11-14
19:20:50.000000000 +0100
@@ -2,7 +2,7 @@
# FindEGL
# -------
#
-# Try to find EGL on a Unix system.
+# Try to find EGL.
#
# This will define the following variables:
#
@@ -65,89 +65,83 @@
message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12
to use FindEGL.cmake")
endif()
-if(NOT WIN32)
- # Use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PKG_EGL QUIET egl)
-
- set(EGL_DEFINITIONS ${PKG_EGL_CFLAGS_OTHER})
-
- find_path(EGL_INCLUDE_DIR
- NAMES
- egl.h
- HINTS
- ${PKG_EGL_INCLUDE_DIRS}
- PATH_SUFFIXES
- EGL
+# Use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+pkg_check_modules(PKG_EGL QUIET egl)
+
+set(EGL_DEFINITIONS ${PKG_EGL_CFLAGS_OTHER})
+
+find_path(EGL_INCLUDE_DIR
+ NAMES
+ egl.h
+ HINTS
+ ${PKG_EGL_INCLUDE_DIRS}
+ PATH_SUFFIXES
+ EGL
+)
+find_library(EGL_LIBRARY
+ NAMES
+ EGL
+ HINTS
+ ${PKG_EGL_LIBRARY_DIRS}
+)
+
+# NB: We do *not* use the version information from pkg-config, as that
+# is the implementation version (eg: the Mesa version)
+if(EGL_INCLUDE_DIR)
+ # egl.h has defines of the form EGL_VERSION_x_y for each supported
+ # version; so the header for EGL 1.1 will define EGL_VERSION_1_0 and
+ # EGL_VERSION_1_1. Finding the highest supported version involves
+ # finding all these defines and selecting the highest numbered.
+ file(READ "${EGL_INCLUDE_DIR}/egl.h" _EGL_header_contents)
+ string(REGEX MATCHALL
+ "[ \\t]EGL_VERSION_[0-9_]+"
+ _EGL_version_lines
+ "${_EGL_header_contents}"
)
- find_library(EGL_LIBRARY
- NAMES
- EGL
- HINTS
- ${PKG_EGL_LIBRARY_DIRS}
- )
-
- # NB: We do *not* use the version information from pkg-config, as that
- # is the implementation version (eg: the Mesa version)
- if(EGL_INCLUDE_DIR)
- # egl.h has defines of the form EGL_VERSION_x_y for each supported
- # version; so the header for EGL 1.1 will define EGL_VERSION_1_0 and
- # EGL_VERSION_1_1. Finding the highest supported version involves
- # finding all these defines and selecting the highest numbered.
- file(READ "${EGL_INCLUDE_DIR}/egl.h" _EGL_header_contents)
- string(REGEX MATCHALL
- "[ \\t]EGL_VERSION_[0-9_]+"
- _EGL_version_lines
- "${_EGL_header_contents}"
+ unset(_EGL_header_contents)
+ foreach(_EGL_version_line ${_EGL_version_lines})
+ string(REGEX REPLACE
+ "[ \\t]EGL_VERSION_([0-9_]+)"
+ "\\1"
+ _version_candidate
+ "${_EGL_version_line}"
)
- unset(_EGL_header_contents)
- foreach(_EGL_version_line ${_EGL_version_lines})
- string(REGEX REPLACE
- "[ \\t]EGL_VERSION_([0-9_]+)"
- "\\1"
- _version_candidate
- "${_EGL_version_line}"
- )
- string(REPLACE "_" "." _version_candidate "${_version_candidate}")
- if(NOT DEFINED EGL_VERSION OR EGL_VERSION VERSION_LESS
_version_candidate)
- set(EGL_VERSION "${_version_candidate}")
- endif()
- endforeach()
- unset(_EGL_version_lines)
- endif()
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(EGL
- FOUND_VAR
- EGL_FOUND
- REQUIRED_VARS
- EGL_LIBRARY
- EGL_INCLUDE_DIR
- VERSION_VAR
- EGL_VERSION
- )
+ string(REPLACE "_" "." _version_candidate "${_version_candidate}")
+ if(NOT DEFINED EGL_VERSION OR EGL_VERSION VERSION_LESS
_version_candidate)
+ set(EGL_VERSION "${_version_candidate}")
+ endif()
+ endforeach()
+ unset(_EGL_version_lines)
+endif()
- if(EGL_FOUND AND NOT TARGET EGL::EGL)
- add_library(EGL::EGL UNKNOWN IMPORTED)
- set_target_properties(EGL::EGL PROPERTIES
- IMPORTED_LOCATION "${EGL_LIBRARY}"
- INTERFACE_COMPILE_OPTIONS "${EGL_DEFINITIONS}"
- INTERFACE_INCLUDE_DIRECTORIES "${EGL_INCLUDE_DIR}"
- )
- endif()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(EGL
+ FOUND_VAR
+ EGL_FOUND
+ REQUIRED_VARS
+ EGL_LIBRARY
+ EGL_INCLUDE_DIR
+ VERSION_VAR
+ EGL_VERSION
+)
+
+if(EGL_FOUND AND NOT TARGET EGL::EGL)
+ add_library(EGL::EGL UNKNOWN IMPORTED)
+ set_target_properties(EGL::EGL PROPERTIES
+ IMPORTED_LOCATION "${EGL_LIBRARY}"
+ INTERFACE_COMPILE_OPTIONS "${EGL_DEFINITIONS}"
+ INTERFACE_INCLUDE_DIRECTORIES "${EGL_INCLUDE_DIR}"
+ )
+endif()
- mark_as_advanced(EGL_LIBRARY EGL_INCLUDE_DIR)
+mark_as_advanced(EGL_LIBRARY EGL_INCLUDE_DIR)
- # compatibility variables
- set(EGL_LIBRARIES ${EGL_LIBRARY})
- set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
- set(EGL_VERSION_STRING ${EGL_VERSION})
-
-else()
- message(STATUS "FindEGL.cmake cannot find EGL on Windows systems. Try
finding WGL instead.")
- set(EGL_FOUND FALSE)
-endif()
+# compatibility variables
+set(EGL_LIBRARIES ${EGL_LIBRARY})
+set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
+set(EGL_VERSION_STRING ${EGL_VERSION})
include(FeatureSummary)
set_package_properties(EGL PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/find-modules/FindQtWaylandScanner.cmake
new/extra-cmake-modules-1.5.0/find-modules/FindQtWaylandScanner.cmake
--- old/extra-cmake-modules-1.4.0/find-modules/FindQtWaylandScanner.cmake
2014-10-23 14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/find-modules/FindQtWaylandScanner.cmake
2014-11-14 19:20:50.000000000 +0100
@@ -2,7 +2,7 @@
# FindQtWaylandScanner
# --------------------
#
-# Try to find qtwaylandscanner on a Unix system.
+# Try to find qtwaylandscanner.
#
# If the qtwaylandscanner executable is not in your PATH, you can provide
# an alternative name or full path location with the
``QtWaylandScanner_EXECUTABLE``
@@ -87,29 +87,24 @@
ecm_find_package_version_check(QtWaylandScanner)
-if(NOT WIN32)
- # Find qtwaylandscanner
- find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(QtWaylandScanner
- FOUND_VAR
- QtWaylandScanner_FOUND
- REQUIRED_VARS
- QtWaylandScanner_EXECUTABLE
- )
-
- mark_as_advanced(QtWaylandScanner_EXECUTABLE)
+# Find qtwaylandscanner
+find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner)
- if(NOT TARGET Wayland::QtScanner AND QtWaylandScanner_FOUND)
- add_executable(Wayland::QtScanner IMPORTED)
- set_target_properties(Wayland::QtScanner PROPERTIES
- IMPORTED_LOCATION "${QtWaylandScanner_EXECUTABLE}"
- )
- endif()
-else()
- message(STATUS "Wayland and QtWayland are not available on Windows.")
- set(QtWaylandScanner_FOUND FALSE)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QtWaylandScanner
+ FOUND_VAR
+ QtWaylandScanner_FOUND
+ REQUIRED_VARS
+ QtWaylandScanner_EXECUTABLE
+)
+
+mark_as_advanced(QtWaylandScanner_EXECUTABLE)
+
+if(NOT TARGET Wayland::QtScanner AND QtWaylandScanner_FOUND)
+ add_executable(Wayland::QtScanner IMPORTED)
+ set_target_properties(Wayland::QtScanner PROPERTIES
+ IMPORTED_LOCATION "${QtWaylandScanner_EXECUTABLE}"
+ )
endif()
include(FeatureSummary)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/find-modules/FindWayland.cmake
new/extra-cmake-modules-1.5.0/find-modules/FindWayland.cmake
--- old/extra-cmake-modules-1.4.0/find-modules/FindWayland.cmake
2014-10-23 14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/find-modules/FindWayland.cmake
2014-11-14 19:20:50.000000000 +0100
@@ -2,7 +2,7 @@
# FindWayland
# -----------
#
-# Try to find Wayland on a Unix system.
+# Try to find Wayland.
#
# This is a component-based find module, which makes use of the COMPONENTS
# and OPTIONAL_COMPONENTS arguments to find_module. The following components
@@ -77,69 +77,63 @@
ecm_find_package_version_check(Wayland)
-if(NOT WIN32)
- set(Wayland_known_components
- Client
- Server
- Cursor
- Egl
+set(Wayland_known_components
+ Client
+ Server
+ Cursor
+ Egl
+)
+foreach(_comp ${Wayland_known_components})
+ string(TOLOWER "${_comp}" _lc_comp)
+ set(Wayland_${_comp}_component_deps)
+ set(Wayland_${_comp}_pkg_config "wayland-${_lc_comp}")
+ set(Wayland_${_comp}_lib "wayland-${_lc_comp}")
+ set(Wayland_${_comp}_header "wayland-${_lc_comp}.h")
+endforeach()
+set(Wayland_Egl_component_deps Client)
+
+ecm_find_package_parse_components(Wayland
+ RESULT_VAR Wayland_components
+ KNOWN_COMPONENTS ${Wayland_known_components}
+)
+ecm_find_package_handle_library_components(Wayland
+ COMPONENTS ${Wayland_components}
+)
+
+# If pkg-config didn't provide us with version information,
+# try to extract it from wayland-version.h
+# (Note that the version from wayland-egl.pc will probably be
+# the Mesa version, rather than the Wayland version, but that
+# version will be ignored as we always find wayland-client.pc
+# first).
+if(NOT Wayland_VERSION)
+ find_file(Wayland_VERSION_HEADER
+ NAMES wayland-version.h
+ HINTS ${Wayland_INCLUDE_DIRS}
)
- foreach(_comp ${Wayland_known_components})
- string(TOLOWER "${_comp}" _lc_comp)
- set(Wayland_${_comp}_component_deps)
- set(Wayland_${_comp}_pkg_config "wayland-${_lc_comp}")
- set(Wayland_${_comp}_lib "wayland-${_lc_comp}")
- set(Wayland_${_comp}_header "wayland-${_lc_comp}.h")
- endforeach()
- set(Wayland_Egl_component_deps Client)
-
- ecm_find_package_parse_components(Wayland
- RESULT_VAR Wayland_components
- KNOWN_COMPONENTS ${Wayland_known_components}
- )
- ecm_find_package_handle_library_components(Wayland
- COMPONENTS ${Wayland_components}
- )
-
- # If pkg-config didn't provide us with version information,
- # try to extract it from wayland-version.h
- # (Note that the version from wayland-egl.pc will probably be
- # the Mesa version, rather than the Wayland version, but that
- # version will be ignored as we always find wayland-client.pc
- # first).
- if(NOT Wayland_VERSION)
- find_file(Wayland_VERSION_HEADER
- NAMES wayland-version.h
- HINTS ${Wayland_INCLUDE_DIRS}
+ mark_as_advanced(Wayland_VERSION_HEADER)
+ if(Wayland_VERSION_HEADER)
+ file(READ ${Wayland_VERSION_HEADER} _wayland_version_header_contents)
+ string(REGEX REPLACE
+ "^.*[ \\t]+WAYLAND_VERSION[ \\t]+\"([0-9.]*)\".*$"
+ "\\1"
+ Wayland_VERSION
+ "${_wayland_version_header_contents}"
)
- mark_as_advanced(Wayland_VERSION_HEADER)
- if(Wayland_VERSION_HEADER)
- file(READ ${Wayland_VERSION_HEADER}
_wayland_version_header_contents)
- string(REGEX REPLACE
- "^.*[ \\t]+WAYLAND_VERSION[ \\t]+\"([0-9.]*)\".*$"
- "\\1"
- Wayland_VERSION
- "${_wayland_version_header_contents}"
- )
- unset(_wayland_version_header_contents)
- endif()
+ unset(_wayland_version_header_contents)
endif()
-
- find_package_handle_standard_args(Wayland
- FOUND_VAR
- Wayland_FOUND
- REQUIRED_VARS
- Wayland_LIBRARIES
- VERSION_VAR
- Wayland_VERSION
- HANDLE_COMPONENTS
- )
-
-else()
- message(STATUS "Wayland is not available on Windows.")
- set(Wayland_FOUND FALSE)
endif()
+find_package_handle_standard_args(Wayland
+ FOUND_VAR
+ Wayland_FOUND
+ REQUIRED_VARS
+ Wayland_LIBRARIES
+ VERSION_VAR
+ Wayland_VERSION
+ HANDLE_COMPONENTS
+)
+
include(FeatureSummary)
set_package_properties(Wayland PROPERTIES
URL "http://wayland.freedesktop.org";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/find-modules/FindWaylandScanner.cmake
new/extra-cmake-modules-1.5.0/find-modules/FindWaylandScanner.cmake
--- old/extra-cmake-modules-1.4.0/find-modules/FindWaylandScanner.cmake
2014-10-23 14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/find-modules/FindWaylandScanner.cmake
2014-11-14 19:20:50.000000000 +0100
@@ -2,7 +2,7 @@
# FindWaylandScanner
# ------------------
#
-# Try to find wayland-scanner on a Unix system.
+# Try to find wayland-scanner.
#
# If the wayland-scanner executable is not in your PATH, you can provide
# an alternative name or full path location with the
``WaylandScanner_EXECUTABLE``
@@ -79,29 +79,24 @@
ecm_find_package_version_check(WaylandScanner)
-if(NOT WIN32)
- # Find wayland-scanner
- find_program(WaylandScanner_EXECUTABLE NAMES wayland-scanner)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(WaylandScanner
- FOUND_VAR
- WaylandScanner_FOUND
- REQUIRED_VARS
- WaylandScanner_EXECUTABLE
- )
-
- mark_as_advanced(WaylandScanner_EXECUTABLE)
+# Find wayland-scanner
+find_program(WaylandScanner_EXECUTABLE NAMES wayland-scanner)
- if(NOT TARGET Wayland::Scanner AND WaylandScanner_FOUND)
- add_executable(Wayland::Scanner IMPORTED)
- set_target_properties(Wayland::Scanner PROPERTIES
- IMPORTED_LOCATION "${WaylandScanner_EXECUTABLE}"
- )
- endif()
-else()
- message(STATUS "Wayland is not available on Windows.")
- set(WaylandScanner_FOUND FALSE)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WaylandScanner
+ FOUND_VAR
+ WaylandScanner_FOUND
+ REQUIRED_VARS
+ WaylandScanner_EXECUTABLE
+)
+
+mark_as_advanced(WaylandScanner_EXECUTABLE)
+
+if(NOT TARGET Wayland::Scanner AND WaylandScanner_FOUND)
+ add_executable(Wayland::Scanner IMPORTED)
+ set_target_properties(Wayland::Scanner PROPERTIES
+ IMPORTED_LOCATION "${WaylandScanner_EXECUTABLE}"
+ )
endif()
include(FeatureSummary)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/find-modules/FindX11_XCB.cmake
new/extra-cmake-modules-1.5.0/find-modules/FindX11_XCB.cmake
--- old/extra-cmake-modules-1.4.0/find-modules/FindX11_XCB.cmake
2014-10-23 14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/find-modules/FindX11_XCB.cmake
2014-11-14 19:20:50.000000000 +0100
@@ -2,7 +2,7 @@
# FindX11_XCB
# -----------
#
-# Try to find the X11 XCB compatibility library on a Unix system
+# Try to find the X11 XCB compatibility library.
#
# This will define the following variables:
#
@@ -68,55 +68,49 @@
message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12
to use FindX11_XCB.cmake")
endif()
-if(NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PKG_X11_XCB QUIET x11-xcb)
-
- set(X11_XCB_DEFINITIONS ${PKG_X11_XCB_CFLAGS_OTHER})
- set(X11_XCB_VERSION ${PKG_X11_XCB_VERSION})
-
- find_path(X11_XCB_INCLUDE_DIR
- NAMES X11/Xlib-xcb.h
- HINTS ${PKG_X11_XCB_INCLUDE_DIRS}
- )
- find_library(X11_XCB_LIBRARY
- NAMES X11-xcb
- HINTS ${PKG_X11_XCB_LIBRARY_DIRS}
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+pkg_check_modules(PKG_X11_XCB QUIET x11-xcb)
+
+set(X11_XCB_DEFINITIONS ${PKG_X11_XCB_CFLAGS_OTHER})
+set(X11_XCB_VERSION ${PKG_X11_XCB_VERSION})
+
+find_path(X11_XCB_INCLUDE_DIR
+ NAMES X11/Xlib-xcb.h
+ HINTS ${PKG_X11_XCB_INCLUDE_DIRS}
+)
+find_library(X11_XCB_LIBRARY
+ NAMES X11-xcb
+ HINTS ${PKG_X11_XCB_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(X11_XCB
+ FOUND_VAR
+ X11_XCB_FOUND
+ REQUIRED_VARS
+ X11_XCB_LIBRARY
+ X11_XCB_INCLUDE_DIR
+ VERSION_VAR
+ X11_XCB_VERSION
+)
+
+if(X11_XCB_FOUND AND NOT TARGET X11::XCB)
+ add_library(X11::XCB UNKNOWN IMPORTED)
+ set_target_properties(X11::XCB PROPERTIES
+ IMPORTED_LOCATION "${X11_XCB_LIBRARY}"
+ INTERFACE_COMPILE_OPTIONS "${X11_XCB_DEFINITIONS}"
+ INTERFACE_INCLUDE_DIRECTORIES "${X11_XCB_INCLUDE_DIR}"
)
+endif()
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(X11_XCB
- FOUND_VAR
- X11_XCB_FOUND
- REQUIRED_VARS
- X11_XCB_LIBRARY
- X11_XCB_INCLUDE_DIR
- VERSION_VAR
- X11_XCB_VERSION
- )
+mark_as_advanced(X11_XCB_INCLUDE_DIR X11_XCB_LIBRARY)
- if(X11_XCB_FOUND AND NOT TARGET X11::XCB)
- add_library(X11::XCB UNKNOWN IMPORTED)
- set_target_properties(X11::XCB PROPERTIES
- IMPORTED_LOCATION "${X11_XCB_LIBRARY}"
- INTERFACE_COMPILE_OPTIONS "${X11_XCB_DEFINITIONS}"
- INTERFACE_INCLUDE_DIRECTORIES "${X11_XCB_INCLUDE_DIR}"
- )
- endif()
-
- mark_as_advanced(X11_XCB_INCLUDE_DIR X11_XCB_LIBRARY)
-
- # compatibility variables
- set(X11_XCB_LIBRARIES ${X11_XCB_LIBRARY})
- set(X11_XCB_INCLUDE_DIRS ${X11_XCB_INCLUDE_DIR})
- set(X11_XCB_VERSION_STRING ${X11_XCB_VERSION})
-
-else()
- message(STATUS "FindX11_XCB.cmake cannot find X11-XCB on Windows systems.")
- set(X11_XCB_FOUND FALSE)
-endif()
+# compatibility variables
+set(X11_XCB_LIBRARIES ${X11_XCB_LIBRARY})
+set(X11_XCB_INCLUDE_DIRS ${X11_XCB_INCLUDE_DIR})
+set(X11_XCB_VERSION_STRING ${X11_XCB_VERSION})
include(FeatureSummary)
set_package_properties(X11_XCB PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.4.0/find-modules/FindXCB.cmake
new/extra-cmake-modules-1.5.0/find-modules/FindXCB.cmake
--- old/extra-cmake-modules-1.4.0/find-modules/FindXCB.cmake 2014-10-23
14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/find-modules/FindXCB.cmake 2014-11-14
19:20:50.000000000 +0100
@@ -2,7 +2,7 @@
# FindXCB
# -------
#
-# Try to find XCB on a Unix system.
+# Try to find XCB.
#
# This is a component-based find module, which makes use of the COMPONENTS and
# OPTIONAL_COMPONENTS arguments to find_module. The following components are
@@ -85,103 +85,98 @@
ecm_find_package_version_check(XCB)
-if(NOT WIN32)
- # Note that this list needs to be ordered such that any component
- # appears after its dependencies
- set(XCB_known_components
- XCB
- RENDER
- SHAPE
- XFIXES
- SHM
- ATOM
- AUX
- COMPOSITE
- CURSOR
- DAMAGE
- DPMS
- DRI2
- DRI3
- EVENT
- EWMH
- GLX
- ICCCM
- IMAGE
- KEYSYMS
- PRESENT
- RANDR
- RECORD
- RENDERUTIL
- RES
- SCREENSAVER
- SYNC
- UTIL
- XEVIE
- XF86DRI
- XINERAMA
- XINPUT
- XKB
- XPRINT
- XTEST
- XV
- XVMC)
- # default component info: xcb components have fairly predictable
- # header files, library names and pkg-config names
- foreach(_comp ${XCB_known_components})
- string(TOLOWER "${_comp}" _lc_comp)
- set(XCB_${_comp}_component_deps XCB)
- set(XCB_${_comp}_pkg_config "xcb-${_lc_comp}")
- set(XCB_${_comp}_lib "xcb-${_lc_comp}")
- set(XCB_${_comp}_header "xcb/${_lc_comp}.h")
- endforeach()
- # exceptions
- set(XCB_XCB_component_deps)
- set(XCB_COMPOSITE_component_deps XCB XFIXES)
- set(XCB_DAMAGE_component_deps XCB XFIXES)
- set(XCB_IMAGE_component_deps XCB SHM)
- set(XCB_RENDERUTIL_component_deps XCB RENDER)
- set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
- set(XCB_XVMC_component_deps XCB XV)
- set(XCB_XV_component_deps XCB SHM)
- set(XCB_XCB_pkg_config "xcb")
- set(XCB_XCB_lib "xcb")
- set(XCB_ATOM_header "xcb/xcb_atom.h")
- set(XCB_ATOM_lib "xcb-util")
- set(XCB_AUX_header "xcb/xcb_aux.h")
- set(XCB_AUX_lib "xcb-util")
- set(XCB_CURSOR_header "xcb/xcb_cursor.h")
- set(XCB_EVENT_header "xcb/xcb_event.h")
- set(XCB_EVENT_lib "xcb-util")
- set(XCB_EWMH_header "xcb/xcb_ewmh.h")
- set(XCB_ICCCM_header "xcb/xcb_icccm.h")
- set(XCB_IMAGE_header "xcb/xcb_image.h")
- set(XCB_KEYSYMS_header "xcb/xcb_keysyms.h")
- set(XCB_PIXEL_header "xcb/xcb_pixel.h")
- set(XCB_RENDERUTIL_header "xcb/xcb_renderutil.h")
- set(XCB_RENDERUTIL_lib "xcb-render-util")
- set(XCB_UTIL_header "xcb/xcb_util.h")
-
- ecm_find_package_parse_components(XCB
- RESULT_VAR XCB_components
- KNOWN_COMPONENTS ${XCB_known_components}
- )
- ecm_find_package_handle_library_components(XCB
- COMPONENTS ${XCB_components}
- )
-
- find_package_handle_standard_args(XCB
- FOUND_VAR
- XCB_FOUND
- REQUIRED_VARS
- XCB_LIBRARIES
- VERSION_VAR
- XCB_VERSION
- HANDLE_COMPONENTS
- )
-else()
- message(STATUS "XCB is not available on Windows.")
- set(XCB_FOUND FALSE)
-endif()
+# Note that this list needs to be ordered such that any component
+# appears after its dependencies
+set(XCB_known_components
+ XCB
+ RENDER
+ SHAPE
+ XFIXES
+ SHM
+ ATOM
+ AUX
+ COMPOSITE
+ CURSOR
+ DAMAGE
+ DPMS
+ DRI2
+ DRI3
+ EVENT
+ EWMH
+ GLX
+ ICCCM
+ IMAGE
+ KEYSYMS
+ PRESENT
+ RANDR
+ RECORD
+ RENDERUTIL
+ RES
+ SCREENSAVER
+ SYNC
+ UTIL
+ XEVIE
+ XF86DRI
+ XINERAMA
+ XINPUT
+ XKB
+ XPRINT
+ XTEST
+ XV
+ XVMC)
+# default component info: xcb components have fairly predictable
+# header files, library names and pkg-config names
+foreach(_comp ${XCB_known_components})
+ string(TOLOWER "${_comp}" _lc_comp)
+ set(XCB_${_comp}_component_deps XCB)
+ set(XCB_${_comp}_pkg_config "xcb-${_lc_comp}")
+ set(XCB_${_comp}_lib "xcb-${_lc_comp}")
+ set(XCB_${_comp}_header "xcb/${_lc_comp}.h")
+endforeach()
+# exceptions
+set(XCB_XCB_component_deps)
+set(XCB_COMPOSITE_component_deps XCB XFIXES)
+set(XCB_DAMAGE_component_deps XCB XFIXES)
+set(XCB_IMAGE_component_deps XCB SHM)
+set(XCB_RENDERUTIL_component_deps XCB RENDER)
+set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
+set(XCB_XVMC_component_deps XCB XV)
+set(XCB_XV_component_deps XCB SHM)
+set(XCB_XCB_pkg_config "xcb")
+set(XCB_XCB_lib "xcb")
+set(XCB_ATOM_header "xcb/xcb_atom.h")
+set(XCB_ATOM_lib "xcb-util")
+set(XCB_AUX_header "xcb/xcb_aux.h")
+set(XCB_AUX_lib "xcb-util")
+set(XCB_CURSOR_header "xcb/xcb_cursor.h")
+set(XCB_EVENT_header "xcb/xcb_event.h")
+set(XCB_EVENT_lib "xcb-util")
+set(XCB_EWMH_header "xcb/xcb_ewmh.h")
+set(XCB_ICCCM_header "xcb/xcb_icccm.h")
+set(XCB_IMAGE_header "xcb/xcb_image.h")
+set(XCB_KEYSYMS_header "xcb/xcb_keysyms.h")
+set(XCB_PIXEL_header "xcb/xcb_pixel.h")
+set(XCB_RENDERUTIL_header "xcb/xcb_renderutil.h")
+set(XCB_RENDERUTIL_lib "xcb-render-util")
+set(XCB_UTIL_header "xcb/xcb_util.h")
+
+ecm_find_package_parse_components(XCB
+ RESULT_VAR XCB_components
+ KNOWN_COMPONENTS ${XCB_known_components}
+)
+ecm_find_package_handle_library_components(XCB
+ COMPONENTS ${XCB_components}
+)
+
+find_package_handle_standard_args(XCB
+ FOUND_VAR
+ XCB_FOUND
+ REQUIRED_VARS
+ XCB_LIBRARIES
+ VERSION_VAR
+ XCB_VERSION
+ HANDLE_COMPONENTS
+)
include(FeatureSummary)
set_package_properties(XCB PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-1.5.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-1.4.0/kde-modules/KDECompilerSettings.cmake
2014-10-23 14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/kde-modules/KDECompilerSettings.cmake
2014-11-14 19:20:50.000000000 +0100
@@ -156,6 +156,10 @@
# Use the Unicode versions of Windows API by default
# See
http://msdn.microsoft.com/en-us/library/windows/desktop/dd317766%28v=vs.85%29.aspx
_kde_add_platform_definitions(-DUNICODE -D_UNICODE)
+
+ # As stated in http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx M_PI
only gets defined
+ # if _USE_MATH_DEFINES is defined, with mingw this has a similar effect as
-D_GNU_SOURCE on math.h
+ _kde_add_platform_definitions(-D_USE_MATH_DEFINES)
endif()
@@ -392,20 +396,30 @@
if (WIN32)
if (MSVC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
- # Make sure that no header adds libcmt by default using
- # #pragma comment(lib, "libcmt.lib") as done by mfc/afx.h
- # Error message this fixes:
+ # MSVC has four incompatible C runtime libraries: static (libcmt),
+ # static debug (libcmtd), shared (msvcrt) and shared debug (msvcrtd):
+ # see http://support.microsoft.com/kb/154753
+ #
+ # By default, when you create static libraries, they are automatically
+ # linked against either libcmt or libcmtd, and when you create shared
+ # libraries, they are automatically linked against either msvcrt or
+ # msvcrtd. Trying to link to both a library that links to libcmt and
+ # library that links to mscvrt, for example, will produce a warning as
+ # described at
+ # http://msdn.microsoft.com/en-us/library/aa267384%28VS.60%29.aspx
+ # and can produce link errors like
# "__thiscall type_info::type_info(class type_info const &)"
# (??0type_info@@AAE@ABV0@@Z) already defined in
LIBCMT.lib(typinfo.obj)
- # See http://msdn.microsoft.com/en-us/library/aa267384%28VS.60%29.aspx
- # and http://support.microsoft.com/kb/154753
- # FIXME: is this still an issue with Visual Studio 2010 and later?
+ #
+ # It is actually the options passed to the compiler, rather than the
+ # linker, which control what will be linked (/MT, /MTd, /MD or /MDd),
+ # but we can override this by telling the linker to ignore any "libcmt"
+ # or "libcmtd" link suggestion embedded in the object files, and
instead
+ # link against the shared versions. That way, everything will link
+ # against the same runtime library.
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/NODEFAULTLIB:libcmt
/DEFAULTLIB:msvcrt ${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:libcmt
/DEFAULTLIB:msvcrt ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "/NODEFAULTLIB:libcmt
/DEFAULTLIB:msvcrt ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL}")
- # use the debug versions of the libraries for debug builds
- # if we just set /NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt
unconditionally in CMAKE_EXE_LINKER_FLAGS we end up
- # linking to the debug and the release C runtime at the same time
which will cause crashes
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/NODEFAULTLIB:libcmtd
/DEFAULTLIB:msvcrtd ${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-1.5.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-1.4.0/kde-modules/KDEInstallDirs.cmake
2014-10-23 14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/kde-modules/KDEInstallDirs.cmake
2014-11-14 19:20:50.000000000 +0100
@@ -114,7 +114,9 @@
# D-Bus system services (``DBUSDIR/system-services``)
# [``DBUS_SYSTEM_SERVICES_INSTALL_DIR``]
# ``SYSCONFDIR``
-# read-only single-machine data (``etc``) [``SYSCONF_INSTALL_DIR``]
+# read-only single-machine data
+# (``etc``, or ``/etc`` if ``CMAKE_INSTALL_DIR`` is ``/usr``)
+# [``SYSCONF_INSTALL_DIR``]
# ``CONFDIR``
# application configuration files (``SYSCONFDIR/xdg``)
# [``CONFIG_INSTALL_DIR``]
@@ -458,9 +460,13 @@
+set(_default_sysconf_dir "etc")
+if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+ set(_default_sysconf_dir "/etc")
+endif()
-_define_absolute(SYSCONFDIR "etc"
+_define_absolute(SYSCONFDIR "${_default_sysconf_dir}"
"read-only single-machine data"
SYSCONF_INSTALL_DIR)
_define_relative(CONFDIR SYSCONFDIR "xdg"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.4.0/tests/CMakeLists.txt
new/extra-cmake-modules-1.5.0/tests/CMakeLists.txt
--- old/extra-cmake-modules-1.4.0/tests/CMakeLists.txt 2014-10-23
14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/tests/CMakeLists.txt 2014-11-14
19:20:50.000000000 +0100
@@ -32,6 +32,9 @@
add_test_macro(KDEInstallDirsTest.vars_defined dummy)
add_test_macro(KDEInstallDirsTest.not_cache_variable dummy)
+set(KDEInstallDirsTest.usr_vars_defined_EXTRA_OPTIONS
+ --build-options -DCMAKE_INSTALL_PREFIX=/usr)
+add_test_macro(KDEInstallDirsTest.usr_vars_defined dummy)
find_package(Qt5Core QUIET)
if (TARGET Qt5::qmake)
set(KDEInstallDirsTest.qt_vars_defined_EXTRA_OPTIONS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/tests/KDEInstallDirsTest/CMakeLists.txt
new/extra-cmake-modules-1.5.0/tests/KDEInstallDirsTest/CMakeLists.txt
--- old/extra-cmake-modules-1.4.0/tests/KDEInstallDirsTest/CMakeLists.txt
2014-10-23 14:48:44.000000000 +0200
+++ new/extra-cmake-modules-1.5.0/tests/KDEInstallDirsTest/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/not_cache_variable)
-
-add_test(
- NAME KDEInstallDirs_not_cache_variable
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/not_cache_variable
- COMMAND "${CMAKE_COMMAND}" "${CMAKE_CURRENT_SOURCE_DIR}/not_cache_variable"
- )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/tests/KDEInstallDirsTest/usr_vars_defined/CMakeLists.txt
new/extra-cmake-modules-1.5.0/tests/KDEInstallDirsTest/usr_vars_defined/CMakeLists.txt
---
old/extra-cmake-modules-1.4.0/tests/KDEInstallDirsTest/usr_vars_defined/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-1.5.0/tests/KDEInstallDirsTest/usr_vars_defined/CMakeLists.txt
2014-11-14 19:20:50.000000000 +0100
@@ -0,0 +1,179 @@
+# In this test, CMAKE_INSTALL_DIR=/usr
+
+project(KDEInstallDirs.vars_defined)
+cmake_minimum_required(VERSION 2.8.12)
+
+set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules)
+set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
+set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}")
+include(KDEInstallDirs)
+
+set(misc_vars
+ CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
+ INSTALL_TARGETS_DEFAULT_ARGS
+ KF5_INSTALL_TARGETS_DEFAULT_ARGS
+)
+
+set(relative_path_vars
+ # old-style variables
+ BIN_INSTALL_DIR
+ CMAKECONFIG_INSTALL_PREFIX
+ DATA_INSTALL_DIR
+ DBUS_INTERFACES_INSTALL_DIR
+ DBUS_SERVICES_INSTALL_DIR
+ DBUS_SYSTEM_SERVICES_INSTALL_DIR
+ EXEC_INSTALL_PREFIX
+ HTML_INSTALL_DIR
+ ICON_INSTALL_DIR
+ IMPORTS_INSTALL_DIR
+ INCLUDE_INSTALL_DIR
+ KCFG_INSTALL_DIR
+ KCONF_UPDATE_INSTALL_DIR
+ KF5_DATA_INSTALL_DIR
+ KF5_INCLUDE_INSTALL_DIR
+ KF5_LIBEXEC_INSTALL_DIR
+ KNOTIFYRC_INSTALL_DIR
+ KXMLGUI_INSTALL_DIR
+ LIBEXEC_INSTALL_DIR
+ LIB_INSTALL_DIR
+ LOCALE_INSTALL_DIR
+ MAN_INSTALL_DIR
+ PLUGIN_INSTALL_DIR
+ QML_INSTALL_DIR
+ QT_PLUGIN_INSTALL_DIR
+ SBIN_INSTALL_DIR
+ SERVICES_INSTALL_DIR
+ SERVICETYPES_INSTALL_DIR
+ SHARE_INSTALL_PREFIX
+ SOUND_INSTALL_DIR
+ TEMPLATES_INSTALL_DIR
+ WALLPAPER_INSTALL_DIR
+ XDG_APPS_INSTALL_DIR
+ XDG_DIRECTORY_INSTALL_DIR
+ XDG_MIME_INSTALL_DIR
+
+ # new-style variables
+ CMAKE_INSTALL_APPDIR
+ CMAKE_INSTALL_BINDIR
+ CMAKE_INSTALL_CMAKEPACKAGEDIR
+ CMAKE_INSTALL_DATADIR
+ CMAKE_INSTALL_DATADIR_KF5
+ CMAKE_INSTALL_DATAROOTDIR
+ CMAKE_INSTALL_DBUSDIR
+ CMAKE_INSTALL_DBUSINTERFACEDIR
+ CMAKE_INSTALL_DBUSSERVICEDIR
+ CMAKE_INSTALL_DBUSSYSTEMSERVICEDIR
+ CMAKE_INSTALL_DESKTOPDIR
+ CMAKE_INSTALL_DOCBUNDLEDIR
+ CMAKE_INSTALL_EXECROOTDIR
+ CMAKE_INSTALL_ICONDIR
+ CMAKE_INSTALL_INCLUDEDIR
+ CMAKE_INSTALL_INCLUDEDIR_KF5
+ CMAKE_INSTALL_INFODIR
+ CMAKE_INSTALL_KCFGDIR
+ CMAKE_INSTALL_KCONFUPDATEDIR
+ CMAKE_INSTALL_KNOTIFY5RCDIR
+ CMAKE_INSTALL_KXMLGUI5DIR
+ CMAKE_INSTALL_KSERVICES5DIR
+ CMAKE_INSTALL_KSERVICETYPES5DIR
+ CMAKE_INSTALL_LIBDIR
+ CMAKE_INSTALL_LIBEXECDIR
+ CMAKE_INSTALL_LIBEXECDIR_KF5
+ CMAKE_INSTALL_LOCALEDIR
+ CMAKE_INSTALL_LOCALSTATEDIR
+ CMAKE_INSTALL_MANDIR
+ CMAKE_INSTALL_MIMEDIR
+ CMAKE_INSTALL_METAINFODIR
+ CMAKE_INSTALL_PLUGINDIR
+ CMAKE_INSTALL_QMLDIR
+ CMAKE_INSTALL_QTPLUGINDIR
+ CMAKE_INSTALL_QTQUICKIMPORTSDIR
+ CMAKE_INSTALL_SBINDIR
+ CMAKE_INSTALL_SHAREDSTATEDIR
+ CMAKE_INSTALL_SOUNDDIR
+ CMAKE_INSTALL_TEMPLATEDIR
+ CMAKE_INSTALL_WALLPAPERDIR
+)
+
+set(absolute_path_vars
+ AUTOSTART_INSTALL_DIR
+ CONFIG_INSTALL_DIR
+ SYSCONF_INSTALL_DIR
+
+ CMAKE_INSTALL_AUTOSTARTDIR
+ CMAKE_INSTALL_CONFDIR
+ CMAKE_INSTALL_SYSCONFDIR
+
+ CMAKE_INSTALL_FULL_APPDIR
+ CMAKE_INSTALL_FULL_AUTOSTARTDIR
+ CMAKE_INSTALL_FULL_BINDIR
+ CMAKE_INSTALL_FULL_CMAKEPACKAGEDIR
+ CMAKE_INSTALL_FULL_CONFDIR
+ CMAKE_INSTALL_FULL_DATADIR
+ CMAKE_INSTALL_FULL_DATADIR_KF5
+ CMAKE_INSTALL_FULL_DATAROOTDIR
+ CMAKE_INSTALL_FULL_DBUSDIR
+ CMAKE_INSTALL_FULL_DBUSINTERFACEDIR
+ CMAKE_INSTALL_FULL_DBUSSERVICEDIR
+ CMAKE_INSTALL_FULL_DBUSSYSTEMSERVICEDIR
+ CMAKE_INSTALL_FULL_DESKTOPDIR
+ CMAKE_INSTALL_FULL_DOCBUNDLEDIR
+ CMAKE_INSTALL_FULL_EXECROOTDIR
+ CMAKE_INSTALL_FULL_ICONDIR
+ CMAKE_INSTALL_FULL_INCLUDEDIR
+ CMAKE_INSTALL_FULL_INCLUDEDIR_KF5
+ CMAKE_INSTALL_FULL_INFODIR
+ CMAKE_INSTALL_FULL_KCFGDIR
+ CMAKE_INSTALL_FULL_KCONFUPDATEDIR
+ CMAKE_INSTALL_FULL_KNOTIFY5RCDIR
+ CMAKE_INSTALL_FULL_KXMLGUI5DIR
+ CMAKE_INSTALL_FULL_KSERVICES5DIR
+ CMAKE_INSTALL_FULL_KSERVICETYPES5DIR
+ CMAKE_INSTALL_FULL_LIBDIR
+ CMAKE_INSTALL_FULL_LIBEXECDIR
+ CMAKE_INSTALL_FULL_LIBEXECDIR_KF5
+ CMAKE_INSTALL_FULL_LOCALEDIR
+ CMAKE_INSTALL_FULL_LOCALSTATEDIR
+ CMAKE_INSTALL_FULL_MANDIR
+ CMAKE_INSTALL_FULL_MIMEDIR
+ CMAKE_INSTALL_FULL_METAINFODIR
+ CMAKE_INSTALL_FULL_PLUGINDIR
+ CMAKE_INSTALL_FULL_QMLDIR
+ CMAKE_INSTALL_FULL_QTPLUGINDIR
+ CMAKE_INSTALL_FULL_QTQUICKIMPORTSDIR
+ CMAKE_INSTALL_FULL_SBINDIR
+ CMAKE_INSTALL_FULL_SHAREDSTATEDIR
+ CMAKE_INSTALL_FULL_SOUNDDIR
+ CMAKE_INSTALL_FULL_SYSCONFDIR
+ CMAKE_INSTALL_FULL_TEMPLATEDIR
+ CMAKE_INSTALL_FULL_WALLPAPERDIR
+)
+if(APPLE)
+ # The default bundle directory is an absolute path
+ list(APPEND absolute_path_vars
+ BUNDLE_INSTALL_DIR
+ CMAKE_INSTALL_BUNDLEDIR
+ CMAKE_INSTALL_FULL_BUNDLEDIR
+ )
+endif()
+
+foreach(variable ${misc_vars} ${relative_path_vars} ${absolute_path_vars})
+ if(NOT DEFINED ${variable})
+ message(SEND_ERROR "${variable} is not defined.")
+ endif()
+endforeach()
+
+foreach(variable ${relative_path_vars})
+ if(IS_ABSOLUTE ${${variable}})
+ message(SEND_ERROR "${variable} (${${variable}}) should be a relative
path, but is absolute.")
+ endif()
+endforeach()
+
+foreach(variable ${absolute_path_vars})
+ if(NOT IS_ABSOLUTE ${${variable}})
+ message(SEND_ERROR "${variable} (${${variable}}) should be an absolute
path, but is relative.")
+ endif()
+endforeach()
+
+add_executable(dummy main.c)
+set_target_properties(dummy PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.4.0/tests/KDEInstallDirsTest/usr_vars_defined/main.c
new/extra-cmake-modules-1.5.0/tests/KDEInstallDirsTest/usr_vars_defined/main.c
---
old/extra-cmake-modules-1.4.0/tests/KDEInstallDirsTest/usr_vars_defined/main.c
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-1.5.0/tests/KDEInstallDirsTest/usr_vars_defined/main.c
2014-11-14 19:20:50.000000000 +0100
@@ -0,0 +1,4 @@
+int main()
+{
+ return 0;
+}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
