Hello community, here is the log from the commit of package extra-cmake-modules for openSUSE:Factory checked in at 2014-07-10 08:17:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-10 14:35:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes 2014-07-10 09:31:14.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 1 21:35:28 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 1.0.0 + * Final release of KDE Frameworks 5 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.0.php + +------------------------------------------------------------------- Old: ---- extra-cmake-modules-0.0.14.tar.xz New: ---- extra-cmake-modules-1.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extra-cmake-modules.spec ++++++ --- /var/tmp/diff_new_pack.VZGMci/_old 2014-07-10 09:31:15.000000000 +0200 +++ /var/tmp/diff_new_pack.VZGMci/_new 2014-07-10 09:31:15.000000000 +0200 @@ -21,7 +21,7 @@ License: BSD-3-Clause Group: Development/Tools/Other Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules -Version: 0.0.14 +Version: 1.0.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ extra-cmake-modules-0.0.14.tar.xz -> extra-cmake-modules-1.0.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-0.0.14/CMakeLists.txt new/extra-cmake-modules-1.0.0/CMakeLists.txt --- old/extra-cmake-modules-0.0.14/CMakeLists.txt 2014-06-01 11:41:44.000000000 +0200 +++ new/extra-cmake-modules-1.0.0/CMakeLists.txt 2014-07-01 20:08:51.000000000 +0200 @@ -1,17 +1,18 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -# We need to set a language to find CMake packages installed in -# architecture-dependent locations (like /usr/lib64) -project(extra-cmake-modules C) +project(extra-cmake-modules NONE) -set(ECM_MAJOR_VERSION 0) +set(ECM_MAJOR_VERSION 1) set(ECM_MINOR_VERSION 0) -set(ECM_PATCH_VERSION 14) +set(ECM_PATCH_VERSION 0) set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION}) -enable_testing() -add_subdirectory(tests) +option(BUILD_TESTING "Build automated tests." ON) +if(BUILD_TESTING) + enable_testing() + add_subdirectory(tests) +endif() set(SHARE_INSTALL_DIR share) set(MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/modules/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-0.0.14/modules/ECMAddTests.cmake new/extra-cmake-modules-1.0.0/modules/ECMAddTests.cmake --- old/extra-cmake-modules-0.0.14/modules/ECMAddTests.cmake 2014-06-01 11:41:44.000000000 +0200 +++ new/extra-cmake-modules-1.0.0/modules/ECMAddTests.cmake 2014-07-01 20:08:51.000000000 +0200 @@ -12,12 +12,19 @@ # [GUI]) # # Add a new unit test using the passed source files. The parameter TEST_NAME is -# used to set the name of the resulting test. It may be omitted if there is -# exactly one source file. In that case the name of the source file (without the -# file extension) will be used as the test name. If the flag GUI is passed the -# test binary will be a GUI executable, otherwise the resulting binary will be a -# console application. The test will be linked against the libraries and/or -# targets passed to LINK_LIBRARIES. +# used to set the name of the resulting test, and the target built for and run +# by the test. It may be omitted if there is exactly one source file. In that +# case the name of the source file (without the file extension) will be used as +# the test name. +# +# If NAME_PREFIX is given, this prefix will be prepended to the test name, but +# not the target name. As a result, it will not prevent clashes between tests +# with the same name in different parts of the project, but it can be used to +# give an indication of where to look for a failing test. +# +# If the flag GUI is passed the test binary will be a GUI executable, otherwise +# the resulting binary will be a console application. The test will be linked +# against the libraries and/or targets passed to LINK_LIBRARIES. # # # :: @@ -54,23 +61,23 @@ set(_sources ${ECM_ADD_TEST_UNPARSED_ARGUMENTS}) list(LENGTH _sources _sourceCount) if(ECM_ADD_TEST_TEST_NAME) - set(_testname ${ECM_ADD_TEST_TEST_NAME}) + set(_targetname ${ECM_ADD_TEST_TEST_NAME}) elseif(${_sourceCount} EQUAL "1") #use the source file name without extension as the testname - get_filename_component(_testname ${_sources} NAME_WE) + get_filename_component(_targetname ${_sources} NAME_WE) else() #more than one source file passed, but no test name given -> error message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"") endif() - set(_testname "${ECM_ADD_TEST_NAME_PREFIX}${_testname}") - add_executable(${_testname} ${_sources}) + set(_testname "${ECM_ADD_TEST_NAME_PREFIX}${_targetname}") + add_executable(${_targetname} ${_sources}) if(NOT ECM_ADD_TEST_GUI) - ecm_mark_nongui_executable(${_testname}) + ecm_mark_nongui_executable(${_targetname}) endif() - add_test(NAME ${_testname} COMMAND ${_testname}) - target_link_libraries(${_testname} ${ECM_ADD_TEST_LINK_LIBRARIES}) - ecm_mark_as_test(${_testname}) + add_test(NAME ${_testname} COMMAND ${_targetname}) + target_link_libraries(${_targetname} ${ECM_ADD_TEST_LINK_LIBRARIES}) + ecm_mark_as_test(${_targetname}) endfunction() function(ecm_add_tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-0.0.14/modules/ECMInstallIcons.cmake new/extra-cmake-modules-1.0.0/modules/ECMInstallIcons.cmake --- old/extra-cmake-modules-0.0.14/modules/ECMInstallIcons.cmake 2014-06-01 11:41:44.000000000 +0200 +++ new/extra-cmake-modules-1.0.0/modules/ECMInstallIcons.cmake 2014-07-01 20:08:51.000000000 +0200 @@ -93,6 +93,7 @@ # For the "compatibility" syntax: a "map" of short theme names to the theme # directory +set(_ECM_ICON_THEME_br "breeze") set(_ECM_ICON_THEME_ox "oxygen") set(_ECM_ICON_THEME_cr "crystalsvg") set(_ECM_ICON_THEME_lo "locolor") @@ -171,6 +172,7 @@ if (NOT ${_group} STREQUAL ${_install_NAME} ) set(_icon_GROUP ${_ECM_ICON_GROUP_${_group}}) if(NOT _icon_GROUP) + message(WARNING "Icon ${_install_NAME} uses invalid category ${_group}, setting to 'actions'") set(_icon_GROUP "actions") endif(NOT _icon_GROUP) # message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name} l10n: ${_l10n_SUBDIR}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-0.0.14/tests/CMakeLists.txt new/extra-cmake-modules-1.0.0/tests/CMakeLists.txt --- old/extra-cmake-modules-0.0.14/tests/CMakeLists.txt 2014-06-01 11:41:44.000000000 +0200 +++ new/extra-cmake-modules-1.0.0/tests/CMakeLists.txt 2014-07-01 20:08:51.000000000 +0200 @@ -1,10 +1,14 @@ -# a macro for tests that have a simple format where the name matches the -# directory and project +# We need to set a language to find CMake packages installed in +# architecture-dependent locations (like /usr/lib64). +# We only set this for the tests, making sure it does not interfere +# with other files (as ECM itself is architecture-independent). +project(ECMTests C) add_subdirectory(ECMGenerateHeadersTest) add_subdirectory(ECMSetupVersionTest) -add_subdirectory(KDEInstallDirsTest) +# a macro for tests that have a simple format where the name matches the +# directory and project macro(ADD_TEST_MACRO NAME COMMAND) string(REPLACE "." "/" dir "${NAME}") string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}") @@ -24,6 +28,8 @@ add_test_macro(ExecuteCoreModules dummy) add_test_macro(ExecuteKDEModules dummy) +add_test_macro(KDEInstallDirsTest.vars_defined dummy) +add_test_macro(KDEInstallDirsTest.not_cache_variable dummy) add_test_macro(FindModules dummy) add_test_macro(UseFindModules dummy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-0.0.14/tests/ExecuteKDEModules/CMakeLists.txt new/extra-cmake-modules-1.0.0/tests/ExecuteKDEModules/CMakeLists.txt --- old/extra-cmake-modules-0.0.14/tests/ExecuteKDEModules/CMakeLists.txt 2014-06-01 11:41:44.000000000 +0200 +++ new/extra-cmake-modules-1.0.0/tests/ExecuteKDEModules/CMakeLists.txt 2014-07-01 20:08:51.000000000 +0200 @@ -16,165 +16,5 @@ include("${module}") endforeach() -set(misc_vars - CMAKE_INSTALL_DEFAULT_COMPONENT_NAME - INSTALL_TARGETS_DEFAULT_ARGS - KF5_INSTALL_TARGETS_DEFAULT_ARGS -) - -set(relative_path_vars - # old-style variables - AUTOSTART_INSTALL_DIR - BIN_INSTALL_DIR - CMAKECONFIG_INSTALL_PREFIX - CONFIG_INSTALL_DIR - 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 - 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 - SYSCONF_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_AUTOSTARTDIR - CMAKE_INSTALL_BINDIR - CMAKE_INSTALL_CMAKEPACKAGEDIR - CMAKE_INSTALL_CONFDIR - 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_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_PLUGINDIR - CMAKE_INSTALL_QMLDIR - CMAKE_INSTALL_QTPLUGINDIR - CMAKE_INSTALL_QTQUICKIMPORTSDIR - CMAKE_INSTALL_SBINDIR - CMAKE_INSTALL_SHAREDSTATEDIR - CMAKE_INSTALL_SOUNDDIR - CMAKE_INSTALL_SYSCONFDIR - CMAKE_INSTALL_TEMPLATEDIR - CMAKE_INSTALL_WALLPAPERDIR -) - -set(absolute_path_vars - 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_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_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-0.0.14/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt new/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt --- old/extra-cmake-modules-0.0.14/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt 2014-06-01 11:41:44.000000000 +0200 +++ new/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt 2014-07-01 20:08:51.000000000 +0200 @@ -5,3 +5,6 @@ set(CMAKE_INSTALL_LIBDIR "foo") include(${kde_modules_dir}/KDEInstallDirs.cmake) + +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-0.0.14/tests/KDEInstallDirsTest/not_cache_variable/main.c new/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/not_cache_variable/main.c --- old/extra-cmake-modules-0.0.14/tests/KDEInstallDirsTest/not_cache_variable/main.c 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/not_cache_variable/main.c 2014-07-01 20:08:51.000000000 +0200 @@ -0,0 +1,4 @@ +int main() +{ + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-0.0.14/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt new/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt --- old/extra-cmake-modules-0.0.14/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt 2014-07-01 20:08:51.000000000 +0200 @@ -0,0 +1,168 @@ +project(KDEInstallDirs.vars_defined) +cmake_minimum_required(VERSION 2.8.12) + +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) +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 + AUTOSTART_INSTALL_DIR + BIN_INSTALL_DIR + CMAKECONFIG_INSTALL_PREFIX + CONFIG_INSTALL_DIR + 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 + 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 + SYSCONF_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_AUTOSTARTDIR + CMAKE_INSTALL_BINDIR + CMAKE_INSTALL_CMAKEPACKAGEDIR + CMAKE_INSTALL_CONFDIR + 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_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_PLUGINDIR + CMAKE_INSTALL_QMLDIR + CMAKE_INSTALL_QTPLUGINDIR + CMAKE_INSTALL_QTQUICKIMPORTSDIR + CMAKE_INSTALL_SBINDIR + CMAKE_INSTALL_SHAREDSTATEDIR + CMAKE_INSTALL_SOUNDDIR + CMAKE_INSTALL_SYSCONFDIR + CMAKE_INSTALL_TEMPLATEDIR + CMAKE_INSTALL_WALLPAPERDIR +) + +set(absolute_path_vars + 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_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_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-0.0.14/tests/KDEInstallDirsTest/vars_defined/main.c new/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/vars_defined/main.c --- old/extra-cmake-modules-0.0.14/tests/KDEInstallDirsTest/vars_defined/main.c 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/vars_defined/main.c 2014-07-01 20:08:51.000000000 +0200 @@ -0,0 +1,4 @@ +int main() +{ + return 0; +} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org