Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked
in at 2014-04-26 17:02:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmake (Old)
and /work/SRC/openSUSE:Factory/.cmake.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2014-03-23
22:29:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-04-26
17:02:01.000000000 +0200
@@ -1,0 +2,36 @@
+Thu Apr 24 23:08:48 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 3.0.0~rc4
+ * Revise and format policy CMP0025 and CMP0047 docs
+ * Do not warn by default when policy CMP0025 or CMP0047 is not set
+ * CMakeDetermineVSServicePack: Format documentation
+ * CMakeDetermineVSServicePack: Match versions more robustly
+ * CMakeDetermineVSServicePack: Add VS 11 update 4
+ * Fortran: Detect pointer size on Intel archs with PGI (#14870)
+ * CMakeRCInformation: Do not mention 'Fortran' in documentation
+ * CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865)
+ * Drop /lib32 and /lib64 from link directories and RPATH (#14875)
+ * cmArchiveWrite: Handle NULL error string (#14882)
+ * Policies: omit warnings about unset policies when they are
+ actually set to NEW
+ * Qt4Macros: Make QT4_CREATE_MOC_COMMAND a function
+ * create_test_sourcelist: Initialize variable at declaration
+ * Help: Fix typo in cmake-qt manual.
+
+-------------------------------------------------------------------
+Wed Apr 23 17:15:17 UTC 2014 - dmuel...@suse.com
+
+- fix build on SLE11
+- remove dependency on system curl: this is not a security
+ senstive app and the system curl comes quite late in the
+ build cycle
+- remove nonsensical checks for %{sles_version}
+
+-------------------------------------------------------------------
+Wed Mar 26 17:33:28 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 3.0.0~rc3
+ * QtDialog: Fix Qt 5 build on non-Windows
+ * Disallow INTERFACE libraries with add_custom_command(TARGET)
+
+-------------------------------------------------------------------
cmake.changes: same change
Old:
----
cmake-3.0.0-rc2.tar.gz
New:
----
cmake-3.0.0-rc4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake-gui.spec ++++++
--- /var/tmp/diff_new_pack.ZqqdBU/_old 2014-04-26 17:02:02.000000000 +0200
+++ /var/tmp/diff_new_pack.ZqqdBU/_new 2014-04-26 17:02:02.000000000 +0200
@@ -17,9 +17,9 @@
Name: cmake-gui
-Version: 3.0.0~rc2
+Version: 3.0.0~rc4
Release: 0
-%define rversion 3.0.0-rc2
+%define rversion 3.0.0-rc4
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v3.0/cmake-%{rversion}.tar.gz
Summary: CMake graphical user interface
++++++ cmake.spec ++++++
--- /var/tmp/diff_new_pack.ZqqdBU/_old 2014-04-26 17:02:02.000000000 +0200
+++ /var/tmp/diff_new_pack.ZqqdBU/_new 2014-04-26 17:02:02.000000000 +0200
@@ -17,9 +17,9 @@
Name: cmake
-Version: 3.0.0~rc2
+Version: 3.0.0~rc4
Release: 0
-%define rversion 3.0.0-rc2
+%define rversion 3.0.0-rc4
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz
Source1: cmake.macros
@@ -33,19 +33,15 @@
%if 0%{?suse_version} > 1010
BuildRequires: fdupes
%endif
-%if 0%{?sles_version} != 10
+%if 0%{?suse_version} > 1110
BuildRequires: libarchive-devel
+BuildRequires: libbz2-devel
%endif
BuildRequires: libexpat-devel
-%else
-BuildRequires: expat-devel
%endif
-BuildRequires: curl-devel
BuildRequires: gcc-c++
BuildRequires: ncurses-devel
-BuildRequires: openssl-devel
BuildRequires: zlib-devel
-BuildRequires: pkgconfig(bzip2)
Requires: make
@@ -64,16 +60,13 @@
--datadir=/share/%{name} \
--docdir=/share/doc/packages/%{name} \
--mandir=/share/man \
-%if 0%{?suse_version} && !0%{?sles_version}
--system-libs \
-%else
- --system-curl \
- --system-expat \
- --system-zlib \
- --system-bzip2 \
+ --no-system-curl \
+%if 0%{?suse_version} <= 1110
--no-system-libarchive \
%endif
--parallel=0%jobs \
+ --verbose \
--no-qt-gui
make VERBOSE=1 %{?_smp_mflags}
@@ -102,6 +95,7 @@
%{_bindir}/ccmake
%{_datadir}/cmake
%{_libdir}/cmake
+%dir %{_datadir}/aclocal
%{_datadir}/aclocal/cmake.m4
%doc %{_datadir}/doc/packages/%{name}
++++++ cmake-3.0.0-rc2.tar.gz -> cmake-3.0.0-rc4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/manual/cmake-qt.7.rst
new/cmake-3.0.0-rc4/Help/manual/cmake-qt.7.rst
--- old/cmake-3.0.0-rc2/Help/manual/cmake-qt.7.rst 2014-03-17
19:18:28.000000000 +0100
+++ new/cmake-3.0.0-rc4/Help/manual/cmake-qt.7.rst 2014-04-16
19:54:40.000000000 +0200
@@ -173,7 +173,7 @@
that the qtmain.lib static library shipped with Qt will be linked by all
dependent executables which have the :prop_tgt:`WIN32_EXECUTABLE` enabled.
-Do disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for
+To disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for
Qt 5 based targets or ``QT4_NO_LINK_QTMAIN`` target property for Qt 4 based
targets.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/manual/cmake-variables.7.rst
new/cmake-3.0.0-rc4/Help/manual/cmake-variables.7.rst
--- old/cmake-3.0.0-rc2/Help/manual/cmake-variables.7.rst 2014-03-17
19:18:28.000000000 +0100
+++ new/cmake-3.0.0-rc4/Help/manual/cmake-variables.7.rst 2014-04-16
19:54:40.000000000 +0200
@@ -131,6 +131,7 @@
/variable/CMAKE_MODULE_PATH
/variable/CMAKE_NOT_USING_CONFIG_FLAGS
/variable/CMAKE_POLICY_DEFAULT_CMPNNNN
+ /variable/CMAKE_POLICY_WARNING_CMPNNNN
/variable/CMAKE_PREFIX_PATH
/variable/CMAKE_PROGRAM_PATH
/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/policy/CMP0025.rst
new/cmake-3.0.0-rc4/Help/policy/CMP0025.rst
--- old/cmake-3.0.0-rc2/Help/policy/CMP0025.rst 2014-03-17 19:18:29.000000000
+0100
+++ new/cmake-3.0.0-rc4/Help/policy/CMP0025.rst 2014-04-16 19:54:40.000000000
+0200
@@ -1,21 +1,27 @@
CMP0025
-------
-Compiler id for Apple Clang is now AppleClang.
+Compiler id for Apple Clang is now ``AppleClang``.
-CMake >= 3.0 recognize that Apple Clang is a different compiler
+CMake 3.0 and above recognize that Apple Clang is a different compiler
than upstream Clang and that they have different version numbers.
-CMake now prefers to present this to projects by setting
-CMAKE_<LANG>_COMPILER_ID to "AppleClang" instead of "Clang". However,
-existing projects may assume the compiler id for Apple Clang is just
-"Clang" as it was in CMake < 3.0. Therefore this policy determines
-for Apple Clang which compiler id to report in
-CMAKE_<LANG>_COMPILER_ID after <LANG> is enabled by the project() or
-enable_language() command.
+CMake now prefers to present this to projects by setting the
+:variable:`CMAKE_<LANG>_COMPILER_ID` variable to ``AppleClang`` instead
+of ``Clang``. However, existing projects may assume the compiler id for
+Apple Clang is just ``Clang`` as it was in CMake versions prior to 3.0.
+Therefore this policy determines for Apple Clang which compiler id to
+report in the :variable:`CMAKE_<LANG>_COMPILER_ID` variable after
+language ``<LANG>`` is enabled by the :command:`project` or
+:command:`enable_language` command. The policy must be set prior
+to the invocation of either command.
-The OLD behavior for this policy is to use compiler id "Clang". The
-NEW behavior for this policy is to use compiler id "AppleClang".
+The OLD behavior for this policy is to use compiler id ``Clang``. The
+NEW behavior for this policy is to use compiler id ``AppleClang``.
-This policy was introduced in CMake version 3.0. CMake version
-|release| warns when the policy is not set and uses OLD behavior. Use
-the cmake_policy command to set it to OLD or NEW explicitly.
+This policy was introduced in CMake version 3.0. Use the
+:command:`cmake_policy` command to set this policy to OLD or NEW explicitly.
+Unlike most policies, CMake version |release| does *not* warn
+by default when this policy is not set and simply uses OLD behavior.
+See documentation of the
+:variable:`CMAKE_POLICY_WARNING_CMP0025 <CMAKE_POLICY_WARNING_CMP<NNNN>>`
+variable to control the warning.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/policy/CMP0047.rst
new/cmake-3.0.0-rc4/Help/policy/CMP0047.rst
--- old/cmake-3.0.0-rc2/Help/policy/CMP0047.rst 2014-03-17 19:18:29.000000000
+0100
+++ new/cmake-3.0.0-rc4/Help/policy/CMP0047.rst 2014-04-16 19:54:40.000000000
+0200
@@ -1,16 +1,28 @@
CMP0047
-------
-Use QCC compiler id for the qcc drivers on QNX.
+Use ``QCC`` compiler id for the qcc drivers on QNX.
-CMake 2.8.12 and lower assigned the QNX qcc and QCC compiler drivers the "GNU"
-compiler id.
+CMake 3.0 and above recognize that the QNX qcc compiler driver is
+different from the GNU compiler.
+CMake now prefers to present this to projects by setting the
+:variable:`CMAKE_<LANG>_COMPILER_ID` variable to ``QCC`` instead
+of ``GNU``. However, existing projects may assume the compiler id for
+QNX qcc is just ``GNU`` as it was in CMake versions prior to 3.0.
+Therefore this policy determines for QNX qcc which compiler id to
+report in the :variable:`CMAKE_<LANG>_COMPILER_ID` variable after
+language ``<LANG>`` is enabled by the :command:`project` or
+:command:`enable_language` command. The policy must be set prior
+to the invocation of either command.
-The OLD behavior for this policy is to use the "GNU" compiler id for the qcc
-and QCC compiler drivers. The NEW behavior for this policy is to use the "QCC"
-compiler id for those drivers.
+The OLD behavior for this policy is to use the ``GNU`` compiler id
+for the qcc and QCC compiler drivers. The NEW behavior for this policy
+is to use the ``QCC`` compiler id for those drivers.
-This policy was introduced in CMake version 3.0.
-CMake version |release| warns when the policy is not set and uses
-OLD behavior. Use the cmake_policy command to set it to OLD or
-NEW explicitly.
+This policy was introduced in CMake version 3.0. Use the
+:command:`cmake_policy` command to set this policy to OLD or NEW explicitly.
+Unlike most policies, CMake version |release| does *not* warn
+by default when this policy is not set and simply uses OLD behavior.
+See documentation of the
+:variable:`CMAKE_POLICY_WARNING_CMP0047 <CMAKE_POLICY_WARNING_CMP<NNNN>>`
+variable to control the warning.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
new/cmake-3.0.0-rc4/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
--- old/cmake-3.0.0-rc2/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc4/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
2014-04-16 19:54:40.000000000 +0200
@@ -0,0 +1,17 @@
+CMAKE_POLICY_WARNING_CMP<NNNN>
+------------------------------
+
+Explicitly enable or disable the warning when CMake Policy ``CMP<NNNN>``
+is not set. This is meaningful only for the few policies that do not
+warn by default:
+
+* ``CMAKE_POLICY_WARNING_CMP0025`` controls the warning for
+ policy :policy:`CMP0025`.
+* ``CMAKE_POLICY_WARNING_CMP0047`` controls the warning for
+ policy :policy:`CMP0047`.
+
+This variable should not be set by a project in CMake code. Project
+developers running CMake may set this variable in their cache to
+enable the warning (e.g. ``-DCMAKE_POLICY_WARNING_CMP<NNNN>=ON``).
+Alternatively, running :manual:`cmake(1)` with the ``--debug-output``
+or ``--trace`` option will also enable the warning.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Modules/CMakeDetermineVSServicePack.cmake
new/cmake-3.0.0-rc4/Modules/CMakeDetermineVSServicePack.cmake
--- old/cmake-3.0.0-rc2/Modules/CMakeDetermineVSServicePack.cmake
2014-03-17 19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Modules/CMakeDetermineVSServicePack.cmake
2014-04-16 19:54:40.000000000 +0200
@@ -2,15 +2,15 @@
# CMakeDetermineVSServicePack
# ---------------------------
#
-# Determine the Visual Studio service pack of the 'cl' in use.
+# Deprecated. Do not use.
#
-# The functionality of this module has been superseded by the platform
-# variable CMAKE_<LANG>_COMPILER_VERSION that contains the compiler
-# version number.
+# The functionality of this module has been superseded by the
+# :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable that contains
+# the compiler version number.
#
-# Usage:
+# Determine the Visual Studio service pack of the 'cl' in use.
#
-# ::
+# Usage::
#
# if(MSVC)
# include(CMakeDetermineVSServicePack)
@@ -21,14 +21,12 @@
# endif()
#
# Function DetermineVSServicePack sets the given variable to one of the
-# following values or an empty string if unknown:
-#
-# ::
+# following values or an empty string if unknown::
#
# vc80, vc80sp1
# vc90, vc90sp1
# vc100, vc100sp1
-# vc110, vc110sp1, vc110sp2
+# vc110, vc110sp1, vc110sp2, vc110sp3, vc110sp4
#=============================================================================
# Copyright 2009-2013 Kitware, Inc.
@@ -68,6 +66,8 @@
set(_version "vc110sp2")
elseif(${_cl_version} VERSION_EQUAL "17.00.60610.1")
set(_version "vc110sp3")
+ elseif(${_cl_version} VERSION_EQUAL "17.00.61030")
+ set(_version "vc110sp4")
else()
set(_version "")
endif()
@@ -86,27 +86,14 @@
OUTPUT_QUIET
)
- string(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+"
- _cl_version "${_output}")
-
- if(_cl_version)
- string(REGEX MATCHALL "[0-9]+"
- _cl_version_list "${_cl_version}")
- list(GET _cl_version_list 0 _major)
- list(GET _cl_version_list 1 _minor)
- list(GET _cl_version_list 2 _patch)
- list(GET _cl_version_list 3 _tweak)
-
+ if(_output MATCHES "Compiler Version
(([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?)")
+ set(_cl_version ${CMAKE_MATCH_1})
+ set(_major ${CMAKE_MATCH_2})
+ set(_minor ${CMAKE_MATCH_3})
if("${_major}${_minor}" STREQUAL "${MSVC_VERSION}")
- set(_cl_version ${_major}.${_minor}.${_patch}.${_tweak})
- else()
- unset(_cl_version)
- endif()
- endif()
-
- if(_cl_version)
set(${_SUCCESS_VAR} true PARENT_SCOPE)
set(${_VERSION_VAR} ${_cl_version} PARENT_SCOPE)
+ endif()
endif()
endif()
endfunction()
@@ -127,20 +114,9 @@
file(REMOVE "${CMAKE_BINARY_DIR}/return0.cc")
- string(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+"
- _cl_version "${_output}")
-
- if(_cl_version)
- string(REGEX MATCHALL "[0-9]+"
- _cl_version_list "${_cl_version}")
-
- list(GET _cl_version_list 0 _major)
- list(GET _cl_version_list 1 _minor)
- list(GET _cl_version_list 2 _patch)
- list(GET _cl_version_list 3 _tweak)
-
+ if(_output MATCHES "Compiler Version
(([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?)")
set(${_SUCCESS_VAR} true PARENT_SCOPE)
- set(${_VERSION_VAR} ${_major}.${_minor}.${_patch}.${_tweak} PARENT_SCOPE)
+ set(${_VERSION_VAR} "${CMAKE_MATCH_1}" PARENT_SCOPE)
endif()
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/CMakeFortranCompilerABI.F
new/cmake-3.0.0-rc4/Modules/CMakeFortranCompilerABI.F
--- old/cmake-3.0.0-rc2/Modules/CMakeFortranCompilerABI.F 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Modules/CMakeFortranCompilerABI.F 2014-04-16
19:54:40.000000000 +0200
@@ -10,11 +10,15 @@
PRINT *, 'INFO:sizeof_dptr[8]'
#elif defined(_M_AMD64)
PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(__x86_64__)
+ PRINT *, 'INFO:sizeof_dptr[8]'
#elif defined(_ILP32)
PRINT *, 'INFO:sizeof_dptr[4]'
#elif defined(_M_IX86)
PRINT *, 'INFO:sizeof_dptr[4]'
+#elif defined(__i386__)
+ PRINT *, 'INFO:sizeof_dptr[4]'
#elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8
PRINT *, 'INFO:sizeof_dptr[8]'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/CMakeRCInformation.cmake
new/cmake-3.0.0-rc4/Modules/CMakeRCInformation.cmake
--- old/cmake-3.0.0-rc2/Modules/CMakeRCInformation.cmake 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Modules/CMakeRCInformation.cmake 2014-04-16
19:54:40.000000000 +0200
@@ -13,15 +13,16 @@
# License text for the above reference.)
-# This file sets the basic flags for the Fortran language in CMake.
+# This file sets the basic flags for the Windows Resource Compiler.
# It also loads the available platform file for the system-compiler
# if it exists.
# make sure we don't use CMAKE_BASE_NAME from somewhere else
set(CMAKE_BASE_NAME)
-get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE)
-if("${CMAKE_BASE_NAME}" MATCHES "windres")
- set(CMAKE_BASE_NAME "windres")
+if(CMAKE_RC_COMPILER MATCHES "windres[^/]*$")
+ set(CMAKE_BASE_NAME "windres")
+else()
+ get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE)
endif()
set(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
@@ -30,7 +31,7 @@
set (CMAKE_RC_FLAGS "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}" CACHE STRING
- "Flags for Fortran compiler.")
+ "Flags for Windows Resource Compiler.")
# These are the only types of flags that should be passed to the rc
# command, if COMPILE_FLAGS is used on a target this will be used
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/Platform/UnixPaths.cmake
new/cmake-3.0.0-rc4/Modules/Platform/UnixPaths.cmake
--- old/cmake-3.0.0-rc2/Modules/Platform/UnixPaths.cmake 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Modules/Platform/UnixPaths.cmake 2014-04-16
19:54:40.000000000 +0200
@@ -83,7 +83,7 @@
)
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
- /lib /usr/lib /usr/lib32 /usr/lib64
+ /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
)
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/Qt4Macros.cmake
new/cmake-3.0.0-rc4/Modules/Qt4Macros.cmake
--- old/cmake-3.0.0-rc2/Modules/Qt4Macros.cmake 2014-03-17 19:18:29.000000000
+0100
+++ new/cmake-3.0.0-rc4/Modules/Qt4Macros.cmake 2014-04-16 19:54:40.000000000
+0200
@@ -103,7 +103,7 @@
# helper macro to set up a moc rule
-macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
+function (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options
moc_target)
# For Windows, create a parameters file to work around command line length
limit
# Pass the parameters in a file. Set the working directory to
# be that containing the parameters file and reference it by
@@ -144,7 +144,7 @@
DEPENDS ${infile}
${_moc_working_dir}
VERBATIM)
-endmacro ()
+endfunction ()
macro (QT4_GENERATE_MOC infile outfile )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/CMakeVersion.cmake
new/cmake-3.0.0-rc4/Source/CMakeVersion.cmake
--- old/cmake-3.0.0-rc2/Source/CMakeVersion.cmake 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/CMakeVersion.cmake 2014-04-16
19:54:40.000000000 +0200
@@ -2,4 +2,4 @@
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 0)
set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 2)
+set(CMake_VERSION_RC 4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/QtDialog/CMakeLists.txt
new/cmake-3.0.0-rc4/Source/QtDialog/CMakeLists.txt
--- old/cmake-3.0.0-rc2/Source/QtDialog/CMakeLists.txt 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/QtDialog/CMakeLists.txt 2014-04-16
19:54:40.000000000 +0200
@@ -28,7 +28,7 @@
qt5_add_resources(${ARGN})
endmacro()
set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
- set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+ set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
# Remove this when the minimum version of Qt is 4.6.
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddCustomTargetCommand.cxx
new/cmake-3.0.0-rc4/Source/cmAddCustomTargetCommand.cxx
--- old/cmake-3.0.0-rc2/Source/cmAddCustomTargetCommand.cxx 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmAddCustomTargetCommand.cxx 2014-04-16
19:54:40.000000000 +0200
@@ -165,10 +165,13 @@
if (!nameOk)
{
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
+ cmOStringStream e;
bool issueMessage = false;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037))
{
case cmPolicies::WARN:
+ e << (this->Makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n";
issueMessage = true;
case cmPolicies::OLD:
break;
@@ -180,9 +183,6 @@
}
if (issueMessage)
{
- cmOStringStream e;
- e << (this->Makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n";
e << "The target name \"" << targetName <<
"\" is reserved or not valid for certain "
"CMake features, such as generator expressions, and may result "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddExecutableCommand.cxx
new/cmake-3.0.0-rc4/Source/cmAddExecutableCommand.cxx
--- old/cmake-3.0.0-rc2/Source/cmAddExecutableCommand.cxx 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmAddExecutableCommand.cxx 2014-04-16
19:54:40.000000000 +0200
@@ -79,10 +79,13 @@
if (!nameOk)
{
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
+ cmOStringStream e;
bool issueMessage = false;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037))
{
case cmPolicies::WARN:
+ e << (this->Makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n";
issueMessage = true;
case cmPolicies::OLD:
break;
@@ -94,9 +97,6 @@
}
if (issueMessage)
{
- cmOStringStream e;
- e << (this->Makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n";
e << "The target name \"" << exename <<
"\" is reserved or not valid for certain "
"CMake features, such as generator expressions, and may result "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddLibraryCommand.cxx
new/cmake-3.0.0-rc4/Source/cmAddLibraryCommand.cxx
--- old/cmake-3.0.0-rc2/Source/cmAddLibraryCommand.cxx 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmAddLibraryCommand.cxx 2014-04-16
19:54:40.000000000 +0200
@@ -214,11 +214,17 @@
if (!nameOk)
{
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
+ cmOStringStream e;
bool issueMessage = false;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037))
{
case cmPolicies::WARN:
- issueMessage = type != cmTarget::INTERFACE_LIBRARY;
+ if(type != cmTarget::INTERFACE_LIBRARY)
+ {
+ e << (this->Makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n";
+ issueMessage = true;
+ }
case cmPolicies::OLD:
break;
case cmPolicies::NEW:
@@ -229,9 +235,6 @@
}
if (issueMessage)
{
- cmOStringStream e;
- e << (this->Makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n";
e << "The target name \"" << libName <<
"\" is reserved or not valid for certain "
"CMake features, such as generator expressions, and may result "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmArchiveWrite.cxx
new/cmake-3.0.0-rc4/Source/cmArchiveWrite.cxx
--- old/cmake-3.0.0-rc2/Source/cmArchiveWrite.cxx 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmArchiveWrite.cxx 2014-04-16
19:54:40.000000000 +0200
@@ -18,6 +18,13 @@
#include <cm_libarchive.h>
//----------------------------------------------------------------------------
+static std::string cm_archive_error_string(struct archive* a)
+{
+ const char* e = archive_error_string(a);
+ return e? e : "unknown error";
+}
+
+//----------------------------------------------------------------------------
class cmArchiveWrite::Entry
{
struct archive_entry* Object;
@@ -60,7 +67,7 @@
if(archive_write_set_compression_none(this->Archive) != ARCHIVE_OK)
{
this->Error = "archive_write_set_compression_none: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
break;
@@ -68,7 +75,7 @@
if(archive_write_set_compression_compress(this->Archive) != ARCHIVE_OK)
{
this->Error = "archive_write_set_compression_compress: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
break;
@@ -76,7 +83,7 @@
if(archive_write_set_compression_gzip(this->Archive) != ARCHIVE_OK)
{
this->Error = "archive_write_set_compression_gzip: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
break;
@@ -84,7 +91,7 @@
if(archive_write_set_compression_bzip2(this->Archive) != ARCHIVE_OK)
{
this->Error = "archive_write_set_compression_bzip2: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
break;
@@ -92,7 +99,7 @@
if(archive_write_set_compression_lzma(this->Archive) != ARCHIVE_OK)
{
this->Error = "archive_write_set_compression_lzma: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
break;
@@ -100,7 +107,7 @@
if(archive_write_set_compression_xz(this->Archive) != ARCHIVE_OK)
{
this->Error = "archive_write_set_compression_xz: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
break;
@@ -109,7 +116,7 @@
if (archive_read_disk_set_standard_lookup(this->Disk) != ARCHIVE_OK)
{
this->Error = "archive_read_disk_set_standard_lookup: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;;
}
#endif
@@ -119,7 +126,7 @@
if(archive_write_set_format_zip(this->Archive) != ARCHIVE_OK)
{
this->Error = "archive_write_set_format_zip: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
break;
@@ -127,7 +134,7 @@
if(archive_write_set_format_pax_restricted(this->Archive) != ARCHIVE_OK)
{
this->Error = "archive_write_set_format_pax_restricted: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
break;
@@ -137,7 +144,7 @@
if (archive_write_set_bytes_in_last_block(this->Archive, 1))
{
this->Error = "archive_write_set_bytes_in_last_block: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
@@ -147,7 +154,7 @@
0) != ARCHIVE_OK)
{
this->Error = "archive_write_open: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return;
}
}
@@ -235,7 +242,7 @@
if(archive_read_disk_entry_from_file(this->Disk, e, -1, 0) != ARCHIVE_OK)
{
this->Error = "archive_read_disk_entry_from_file: ";
- this->Error += archive_error_string(this->Disk);
+ this->Error += cm_archive_error_string(this->Disk);
return false;
}
// Clear acl and xattr fields not useful for distribution.
@@ -245,7 +252,7 @@
if(archive_write_header(this->Archive, e) != ARCHIVE_OK)
{
this->Error = "archive_write_header: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return false;
}
@@ -292,7 +299,7 @@
if(archive_write_data(this->Archive, buffer, nnext) != nnext_s)
{
this->Error = "archive_write_data: ";
- this->Error += archive_error_string(this->Archive);
+ this->Error += cm_archive_error_string(this->Archive);
return false;
}
nleft -= nnext;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmComputeTargetDepends.cxx
new/cmake-3.0.0-rc4/Source/cmComputeTargetDepends.cxx
--- old/cmake-3.0.0-rc2/Source/cmComputeTargetDepends.cxx 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmComputeTargetDepends.cxx 2014-04-16
19:54:40.000000000 +0200
@@ -349,9 +349,12 @@
cmMakefile *makefile = depender->GetMakefile();
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
bool issueMessage = false;
+ cmOStringStream e;
switch(depender->GetPolicyStatusCMP0046())
{
case cmPolicies::WARN:
+ e << (makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n";
issueMessage = true;
case cmPolicies::OLD:
break;
@@ -364,9 +367,7 @@
if(issueMessage)
{
cmake* cm = this->GlobalGenerator->GetCMakeInstance();
- cmOStringStream e;
- e << (makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n";
+
e << "The dependency target \"" << dependee_name
<< "\" of target \"" << depender->GetName() << "\" does not exist.";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmGlobalGenerator.cxx
new/cmake-3.0.0-rc4/Source/cmGlobalGenerator.cxx
--- old/cmake-3.0.0-rc2/Source/cmGlobalGenerator.cxx 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmGlobalGenerator.cxx 2014-04-16
19:54:40.000000000 +0200
@@ -759,7 +759,8 @@
switch(mf->GetPolicyStatus(cmPolicies::CMP0025))
{
case cmPolicies::WARN:
- if(!this->CMakeInstance->GetIsInTryCompile())
+ if(!this->CMakeInstance->GetIsInTryCompile() &&
+ mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0025"))
{
cmOStringStream w;
w << policies->GetPolicyWarning(cmPolicies::CMP0025) << "\n"
@@ -790,7 +791,8 @@
switch(mf->GetPolicyStatus(cmPolicies::CMP0047))
{
case cmPolicies::WARN:
- if(!this->CMakeInstance->GetIsInTryCompile())
+ if(!this->CMakeInstance->GetIsInTryCompile() &&
+ mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0047"))
{
cmOStringStream w;
w << policies->GetPolicyWarning(cmPolicies::CMP0047) << "\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmIncludeCommand.cxx
new/cmake-3.0.0-rc4/Source/cmIncludeCommand.cxx
--- old/cmake-3.0.0-rc2/Source/cmIncludeCommand.cxx 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmIncludeCommand.cxx 2014-04-16
19:54:40.000000000 +0200
@@ -98,11 +98,14 @@
if (gg->IsExportedTargetsFile(fname_abs))
{
const char *modal = 0;
+ cmOStringStream e;
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0024))
{
case cmPolicies::WARN:
+ e << (this->Makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0024)) << "\n";
modal = "should";
case cmPolicies::OLD:
break;
@@ -114,9 +117,6 @@
}
if (modal)
{
- cmOStringStream e;
- e << (this->Makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0024)) << "\n";
e << "The file\n " << fname_abs << "\nwas generated by the export() "
"command. It " << modal << " not be used as the argument to the "
"include() command. Use ALIAS targets instead to refer to targets "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmLocalGenerator.cxx
new/cmake-3.0.0-rc4/Source/cmLocalGenerator.cxx
--- old/cmake-3.0.0-rc2/Source/cmLocalGenerator.cxx 2014-03-17
19:18:29.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmLocalGenerator.cxx 2014-04-16
19:54:40.000000000 +0200
@@ -263,7 +263,8 @@
for(cmGeneratorTargetsType::iterator t = targets.begin();
t != targets.end(); ++t)
{
- if (t->second->Target->IsImported())
+ if (t->second->Target->IsImported()
+ || t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
{
continue;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmMakefile.cxx
new/cmake-3.0.0-rc4/Source/cmMakefile.cxx
--- old/cmake-3.0.0-rc2/Source/cmMakefile.cxx 2014-03-17 19:18:29.000000000
+0100
+++ new/cmake-3.0.0-rc4/Source/cmMakefile.cxx 2014-04-16 19:54:41.000000000
+0200
@@ -893,9 +893,12 @@
{
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
bool issueMessage = false;
+ cmOStringStream e;
switch(this->GetPolicyStatus(cmPolicies::CMP0040))
{
case cmPolicies::WARN:
+ e << (this->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n";
issueMessage = true;
case cmPolicies::OLD:
break;
@@ -908,9 +911,6 @@
if(issueMessage)
{
- cmOStringStream e;
- e << (this->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n";
e << "The target name \"" << target << "\" is unknown in this context.";
IssueMessage(messageType, e.str().c_str());
}
@@ -926,6 +926,14 @@
this->IssueMessage(cmake::FATAL_ERROR, e.str());
return;
}
+ if(ti->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+ {
+ cmOStringStream e;
+ e << "Target \"" << target << "\" is an INTERFACE library "
+ "that may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands.";
+ this->IssueMessage(cmake::FATAL_ERROR, e.str());
+ return;
+ }
// Add the command to the appropriate build step for the target.
std::vector<std::string> no_output;
cmCustomCommand cc(this, no_output, depends,
@@ -4342,6 +4350,22 @@
return this->GetPolicies()->GetPolicyStatus(id);
}
+//----------------------------------------------------------------------------
+bool cmMakefile::PolicyOptionalWarningEnabled(std::string const& var)
+{
+ // Check for an explicit CMAKE_POLICY_WARNING_CMP<NNNN> setting.
+ if(!var.empty())
+ {
+ if(const char* val = this->GetDefinition(var.c_str()))
+ {
+ return cmSystemTools::IsOn(val);
+ }
+ }
+ // Enable optional policy warnings with --debug-output or --trace.
+ cmake* cm = this->GetCMakeInstance();
+ return cm->GetDebugOutput() || cm->GetTrace();
+}
+
bool cmMakefile::SetPolicy(const char *id,
cmPolicies::PolicyStatus status)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmMakefile.h
new/cmake-3.0.0-rc4/Source/cmMakefile.h
--- old/cmake-3.0.0-rc2/Source/cmMakefile.h 2014-03-17 19:18:29.000000000
+0100
+++ new/cmake-3.0.0-rc4/Source/cmMakefile.h 2014-04-16 19:54:41.000000000
+0200
@@ -875,6 +875,8 @@
std::set<cmStdString> const & GetSystemIncludeDirectories() const
{ return this->SystemIncludeDirectories; }
+ bool PolicyOptionalWarningEnabled(std::string const& var);
+
protected:
// add link libraries and directories to the target
void AddGlobalLinkInformation(const char* name, cmTarget& target);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmTarget.cxx
new/cmake-3.0.0-rc4/Source/cmTarget.cxx
--- old/cmake-3.0.0-rc2/Source/cmTarget.cxx 2014-03-17 19:18:29.000000000
+0100
+++ new/cmake-3.0.0-rc4/Source/cmTarget.cxx 2014-04-16 19:54:41.000000000
+0200
@@ -2636,11 +2636,14 @@
{
return true;
}
+ cmOStringStream e;
const char *modal = 0;
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0026))
{
case cmPolicies::WARN:
+ e << (this->Makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0026)) << "\n";
modal = "should";
case cmPolicies::OLD:
break;
@@ -2653,9 +2656,6 @@
if (modal)
{
- cmOStringStream e;
- e << (this->Makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0026)) << "\n";
e << "The LOCATION property " << modal << " not be read from target \""
<< this->GetName() << "\". Use the target name directly with "
"add_custom_command, or use the generator expression $<TARGET_FILE>, "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Source/cmTargetLinkLibrariesCommand.cxx
new/cmake-3.0.0-rc4/Source/cmTargetLinkLibrariesCommand.cxx
--- old/cmake-3.0.0-rc2/Source/cmTargetLinkLibrariesCommand.cxx 2014-03-17
19:18:30.000000000 +0100
+++ new/cmake-3.0.0-rc4/Source/cmTargetLinkLibrariesCommand.cxx 2014-04-16
19:54:41.000000000 +0200
@@ -103,11 +103,14 @@
if (this->Target->GetType() == cmTarget::UTILITY)
{
+ cmOStringStream e;
const char *modal = 0;
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0039))
{
case cmPolicies::WARN:
+ e << this->Makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0039) << "\n";
modal = "should";
case cmPolicies::OLD:
break;
@@ -119,9 +122,7 @@
}
if (modal)
{
- cmOStringStream e;
- e << this->Makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0039) << "\n"
+ e <<
"Utility target \"" << this->Target->GetName() << "\" " << modal
<< " not be used as the target of a target_link_libraries call.";
this->Makefile->IssueMessage(messageType, e.str().c_str());
@@ -373,11 +374,14 @@
? cmTarget::KeywordTLLSignature : cmTarget::PlainTLLSignature;
if (!this->Target->PushTLLCommandTrace(sig))
{
+ cmOStringStream e;
const char *modal = 0;
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0023))
{
case cmPolicies::WARN:
+ e << this->Makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0023) << "\n";
modal = "should";
case cmPolicies::OLD:
break;
@@ -390,14 +394,12 @@
if(modal)
{
- cmOStringStream e;
// If the sig is a keyword form and there is a conflict, the existing
// form must be the plain form.
const char *existingSig
= (sig == cmTarget::KeywordTLLSignature ? "plain"
: "keyword");
- e << this->Makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0023) << "\n"
+ e <<
"The " << existingSig << " signature for target_link_libraries "
"has already been used with the target \""
<< this->Target->GetName() << "\". All uses of "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0-rc2/Templates/TestDriver.cxx.in
new/cmake-3.0.0-rc4/Templates/TestDriver.cxx.in
--- old/cmake-3.0.0-rc2/Templates/TestDriver.cxx.in 2014-03-17
19:18:30.000000000 +0100
+++ new/cmake-3.0.0-rc4/Templates/TestDriver.cxx.in 2014-04-16
19:54:41.000000000 +0200
@@ -58,7 +58,7 @@
int main(int ac, char *av[])
{
- int i, NumTests, testNum, partial_match;
+ int i, NumTests, testNum = 0, partial_match;
char *arg, *test_name;
int count;
int testToRun = -1;
@@ -81,7 +81,6 @@
}
printf("To run a test, enter the test number: ");
fflush(stdout);
- testNum = 0;
if( scanf("%d", &testNum) != 1 )
{
printf("Couldn't parse that input as a number\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt
---
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,8 +1,4 @@
CMake Error at CMP0026-CONFIG-LOCATION-NEW.cmake:7 \(get_target_property\):
- Policy CMP0026 is not set: Disallow use of the LOCATION target property.
- Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy
- command to set the policy and suppress this warning.
-
The LOCATION property may not be read from target "somelib". Use the
target name directly with add_custom_command, or use the generator
expression \$<TARGET_FILE>, as appropriate.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt
---
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,8 +1,4 @@
CMake Error at CMP0026-LOCATION-CONFIG-NEW.cmake:7 \(get_target_property\):
- Policy CMP0026 is not set: Disallow use of the LOCATION target property.
- Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy
- command to set the policy and suppress this warning.
-
The LOCATION property may not be read from target "somelib". Use the
target name directly with add_custom_command, or use the generator
expression \$<TARGET_FILE>, as appropriate.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt
--- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,8 +1,4 @@
CMake Error at CMP0026-NEW.cmake:7 \(get_target_property\):
- Policy CMP0026 is not set: Disallow use of the LOCATION target property.
- Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy
- command to set the policy and suppress this warning.
-
The LOCATION property may not be read from target "somelib". Use the
target name directly with add_custom_command, or use the generator
expression \$<TARGET_FILE>, as appropriate.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt
--- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,9 +1,4 @@
CMake Error at CMP0037-NEW-colon.cmake:4 \(add_library\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "lib:colon" is reserved or not valid for certain CMake
features, such as generator expressions, and may result in undefined
behavior.
@@ -11,11 +6,6 @@
CMakeLists.txt:3 \(include\)
+
CMake Error at CMP0037-NEW-colon.cmake:5 \(add_executable\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "exe:colon" is reserved or not valid for certain CMake
features, such as generator expressions, and may result in undefined
behavior.
@@ -23,11 +13,6 @@
CMakeLists.txt:3 \(include\)
+
CMake Error at CMP0037-NEW-colon.cmake:6 \(add_custom_target\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "custom:colon" is reserved or not valid for certain CMake
features, such as generator expressions, and may result in undefined
behavior.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt
--- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,20 +1,10 @@
CMake Error at CMP0037-NEW-reserved.cmake:4 \(add_library\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "all" is reserved or not valid for certain CMake features,
such as generator expressions, and may result in undefined behavior.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
CMake Error at CMP0037-NEW-reserved.cmake:5 \(add_executable\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "clean" is reserved or not valid for certain CMake
features, such as generator expressions, and may result in undefined
behavior.
@@ -22,11 +12,6 @@
CMakeLists.txt:3 \(include\)
+
CMake Error at CMP0037-NEW-reserved.cmake:6 \(add_custom_target\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "help" is reserved or not valid for certain CMake features,
such as generator expressions, and may result in undefined behavior.
Call Stack \(most recent call first\):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt
--- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,9 +1,4 @@
CMake Error at CMP0037-NEW-space.cmake:4 \(add_library\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "lib with spaces" is reserved or not valid for certain
CMake features, such as generator expressions, and may result in undefined
behavior.
@@ -11,11 +6,6 @@
CMakeLists.txt:3 \(include\)
+
CMake Error at CMP0037-NEW-space.cmake:5 \(add_executable\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "exe with spaces" is reserved or not valid for certain
CMake features, such as generator expressions, and may result in undefined
behavior.
@@ -23,11 +13,6 @@
CMakeLists.txt:3 \(include\)
+
CMake Error at CMP0037-NEW-space.cmake:6 \(add_custom_target\):
- Policy CMP0037 is not set: Target names should not be reserved and should
- match a validity pattern. Run "cmake --help-policy CMP0037" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The target name "custom with spaces" is reserved or not valid for certain
CMake features, such as generator expressions, and may result in undefined
behavior.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt
--- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,8 +1,4 @@
CMake Error at CMP0039-NEW.cmake:7 \(target_link_libraries\):
- Policy CMP0039 is not set: Utility targets may not have link dependencies.
- Run "cmake --help-policy CMP0039" for policy details. Use the cmake_policy
- command to set the policy and suppress this warning.
-
Utility target "utility" must not be used as the target of a
target_link_libraries call.
Call Stack \(most recent call first\):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt
---
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,9 +1,4 @@
CMake Error at CMP0040-NEW-missing-target.cmake:3 \(add_custom_command\):
- Policy CMP0040 is not set: The target in the TARGET signature of
- add_custom_command\(\) must exist. Run "cmake --help-policy CMP0040" for
- policy details. Use the cmake_policy command to set the policy and
- suppress this warning.
-+
The target name "foobar" is unknown in this context.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt
---
old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt
2014-03-17 19:18:30.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt
2014-04-16 19:54:41.000000000 +0200
@@ -1,8 +1,4 @@
CMake Error at CMP0046-NEW-missing-dependency.cmake:4 \(add_dependencies\):
- Policy CMP0046 is not set: Error on non-existent dependency in
- add_dependencies. Run "cmake --help-policy CMP0046" for policy details.
- Use the cmake_policy command to set the policy and suppress this warning.
-+
The dependency target "bar" of target "foo" does not exist.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/include/CMP0024-NEW-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/include/CMP0024-NEW-stderr.txt
--- old/cmake-3.0.0-rc2/Tests/RunCMake/include/CMP0024-NEW-stderr.txt
2014-03-17 19:18:31.000000000 +0100
+++ new/cmake-3.0.0-rc4/Tests/RunCMake/include/CMP0024-NEW-stderr.txt
2014-04-16 19:54:42.000000000 +0200
@@ -1,8 +1,4 @@
CMake Error at subdir2/CMakeLists.txt:2 \(include\):
- Policy CMP0024 is not set: Disallow include export result. Run "cmake
- --help-policy CMP0024" for policy details. Use the cmake_policy command to
- set the policy and suppress this warning.
-
The file
.*/Tests/RunCMake/include/CMP0024-NEW-build/subdir1/theTargets.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/RunCMakeTest.cmake
new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/RunCMakeTest.cmake
--- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/RunCMakeTest.cmake
2014-03-17 19:18:31.000000000 +0100
+++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/RunCMakeTest.cmake
2014-04-16 19:54:42.000000000 +0200
@@ -8,3 +8,4 @@
run_cmake(global-interface)
run_cmake(genex_link)
run_cmake(add_dependencies)
+run_cmake(add_custom_command-TARGET)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt
---
old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt
2014-04-16 19:54:42.000000000 +0200
@@ -0,0 +1 @@
+1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt
---
old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt
2014-04-16 19:54:42.000000000 +0200
@@ -0,0 +1,5 @@
+CMake Error at add_custom_command-TARGET.cmake:4 \(add_custom_command\):
+ Target "iface" is an INTERFACE library that may not have PRE_BUILD,
+ PRE_LINK, or POST_BUILD commands.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake
new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake
---
old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake
1970-01-01 01:00:00.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake
2014-04-16 19:54:42.000000000 +0200
@@ -0,0 +1,6 @@
+
+add_library(iface INTERFACE)
+
+add_custom_command(TARGET iface
+ COMMAND "${CMAKE_COMMAND}" -E echo test
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt
---
old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt
2014-03-17 19:18:31.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt
2014-04-16 19:54:42.000000000 +0200
@@ -1,9 +1,4 @@
CMake Error at CMP0023-NEW-2.cmake:11 \(target_link_libraries\):
- Policy CMP0023 is not set: Plain and keyword target_link_libraries
- signatures cannot be mixed. Run "cmake --help-policy CMP0023" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The plain signature for target_link_libraries has already been used with
the target "foo". All uses of target_link_libraries with a target must be
either all-keyword or all-plain.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt
new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt
---
old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt
2014-03-17 19:18:31.000000000 +0100
+++
new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt
2014-04-16 19:54:42.000000000 +0200
@@ -1,9 +1,4 @@
CMake Error at CMP0023-NEW.cmake:11 \(target_link_libraries\):
- Policy CMP0023 is not set: Plain and keyword target_link_libraries
- signatures cannot be mixed. Run "cmake --help-policy CMP0023" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-
The plain signature for target_link_libraries has already been used with
the target "foo". All uses of target_link_libraries with a target must be
either all-keyword or all-plain.
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
