Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked
in at 2015-01-25 21:13:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-01-21
21:51:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2015-01-25
21:13:27.000000000 +0100
@@ -1,0 +2,50 @@
+Thu Jan 22 23:01:01 UTC 2015 - f...@grueninger.de
+
+- Update to 3.1.1
+ Eclipse: Add org.eclipse.cdt.core.cnature to CXX projects (#15068)
+ get_test_property: clarify the documentation
+ set_tests_properties: fix documentation
+ tests: add tests for querying properties
+ Xcode: Sort targets deterministically and with ALL_BUILD first (#15346)
+ bootstrap: Fix syntax for Solaris 10 shell (#15317)
+ Help: Clarify MinGW v. MSYS Makefiles generators (#15319)
+ Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)
+ Ninja: Generate rules only for languages compiled in a target (#15325)
+ Tests: Test using objects from a language enabled in a subdirectory
(#15325)
+ Help: Add 3.1 release note about '#' escaping in Makefiles (#15322)
+ Help: Clarify if(<variable>) documentation (#15335)
+ Help: Document CMAKE_FIND_PACKAGE_NAME variable
+ Xcode: Do not require code signing for compiler id (#15214)
+ Copyright.txt: Update year range to end in 2015
+ XL: Fix link flags for executables on Linux with XL compilers
+ QNX: Fix detection of QCC compiler id (#15349)
+ Xcode: Fix early termination on per-config source file error CMake 3.1.1
+ CPack: Fix PackageMaker internal versioning for OS X 10.10
+ Fix compilation with the Oracle / Sun compiler (#15318)
+ Help: Small fixes in CPackComponent documentation
+ FindRuby: fix selection of version x.0 (#15345)
+ CPack: Avoid crash on invalid CMake generator name (#15308)
+ FindRuby: Fix output check in _RUBY_CONFIG_VAR
+ find_package: Document CMAKE_FIND_PACKAGE_NAME variable
+ QtAutoUic: Restore source file AUTOUIC_OPTIONS settings
+ FindCUDA: Do not assume CMAKE_SYSTEM_PROCESSOR is set
+ cmake-mode.el: Fix extracting keyword at point in cmake-help
+ cmake-mode.el: Re-add explicit call to require thingatpt
+ FindIce: Port to work with CMP0054 NEW behavior
+ FindSDL: Allow if() to dereference SDL_INCLUDE_DIR for matching
+ FindQt: fix setting DESIRED_QT_VERSION if "find_package(Qt VVV)" was
called
+ FindQt: fix variable name in error message
+ FindQt: explicitely mention that it cannot Qt5 or later
+ FindBoost: Add latest Boost version 1.57.0 and next milestone 1.58.0
+ KWSys Terminal: Add xterm-termite to VT100 color support whitelist
+ Help: Document valid 14 value for CXX_STANDARD. (#15339)
+ get_target_property: discern empty from undefined properties (#15333)
+ QtAutoUic: Add a test for the regression in the parent commit.
+ cmMakefile: Rename a method to what it really does.
+ Features: Fix the COMPILE_FEATURES genex for unavailable features.
+ cmTarget: Compute link language of TARGET_OBJECTS with CMP0026 OLD
(#15338)
+ Help: Link relevant documents for virtual override features (#15311)
+ Help: Add INTERFACE_LIBRARY to TYPE target property documentation
+ Help: Update cmake.org links to avoid redirects
+
+-------------------------------------------------------------------
cmake.changes: same change
Old:
----
cmake-3.1.0.tar.gz
New:
----
cmake-3.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake-gui.spec ++++++
--- /var/tmp/diff_new_pack.L3I8X3/_old 2015-01-25 21:13:28.000000000 +0100
+++ /var/tmp/diff_new_pack.L3I8X3/_new 2015-01-25 21:13:28.000000000 +0100
@@ -17,7 +17,7 @@
Name: cmake-gui
-Version: 3.1.0
+Version: 3.1.1
Release: 0
%define rversion %{version}
Summary: CMake graphical user interface
cmake.spec: same change
++++++ cmake-3.1.0.tar.gz -> cmake-3.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Auxiliary/cmake-indent.vim
new/cmake-3.1.1/Auxiliary/cmake-indent.vim
--- old/cmake-3.1.0/Auxiliary/cmake-indent.vim 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Auxiliary/cmake-indent.vim 2015-01-21 15:10:25.000000000
+0100
@@ -16,7 +16,7 @@
" Version: $Revision$
"
" Licence: The CMake license applies to this file. See
-" http://www.cmake.org/HTML/Copyright.html
+" http://www.cmake.org/licensing
" This implies that distribution with Vim is allowed
if exists("b:did_indent")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Auxiliary/cmake-mode.el
new/cmake-3.1.1/Auxiliary/cmake-mode.el
--- old/cmake-3.1.0/Auxiliary/cmake-mode.el 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Auxiliary/cmake-mode.el 2015-01-21 15:10:25.000000000
+0100
@@ -321,8 +321,13 @@
)
(require 'thingatpt)
+(defun cmake-symbol-at-point ()
+ (let ((symbol (symbol-at-point)))
+ (and (not (null symbol))
+ (symbol-name symbol))))
+
(defun cmake-help-type (type)
- (let* ((default-entry (word-at-point))
+ (let* ((default-entry (cmake-symbol-at-point))
(history (car (cdr (cdr (assoc type cmake-string-to-list-symbol)))))
(input (completing-read
(format "CMake %s: " type) ; prompt
@@ -365,7 +370,7 @@
(defun cmake-help ()
"Queries for any of the four available help topics and prints out the
approriate page."
(interactive)
- (let* ((default-entry (word-at-point))
+ (let* ((default-entry (cmake-symbol-at-point))
(command-list (cmake-get-list "command"))
(variable-list (cmake-get-list "variable"))
(module-list (cmake-get-list "module"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Auxiliary/cmake-syntax.vim
new/cmake-3.1.1/Auxiliary/cmake-syntax.vim
--- old/cmake-3.1.0/Auxiliary/cmake-syntax.vim 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Auxiliary/cmake-syntax.vim 2015-01-21 15:10:25.000000000
+0100
@@ -16,7 +16,7 @@
" Version: $Revision$
"
" Licence: The CMake license applies to this file. See
-" http://www.cmake.org/HTML/Copyright.html
+" http://www.cmake.org/licensing
" This implies that distribution with Vim is allowed
" For version 5.x: Clear all syntax items
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Copyright.txt
new/cmake-3.1.1/Copyright.txt
--- old/cmake-3.1.0/Copyright.txt 2014-12-15 21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Copyright.txt 2015-01-21 15:10:25.000000000 +0100
@@ -1,5 +1,5 @@
CMake - Cross Platform Makefile Generator
-Copyright 2000-2014 Kitware, Inc.
+Copyright 2000-2015 Kitware, Inc.
Copyright 2000-2011 Insight Software Consortium
All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/command/find_package.rst
new/cmake-3.1.1/Help/command/find_package.rst
--- old/cmake-3.1.0/Help/command/find_package.rst 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/command/find_package.rst 2015-01-21
15:10:25.000000000 +0100
@@ -312,6 +312,8 @@
defines variables to provide information about the call arguments (and
restores their original state before returning):
+``CMAKE_FIND_PACKAGE_NAME``
+ the ``<package>`` name which is searched for
``<package>_FIND_REQUIRED``
true if ``REQUIRED`` option was given
``<package>_FIND_QUIETLY``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/command/get_test_property.rst
new/cmake-3.1.1/Help/command/get_test_property.rst
--- old/cmake-3.1.0/Help/command/get_test_property.rst 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/command/get_test_property.rst 2015-01-21
15:10:25.000000000 +0100
@@ -7,9 +7,9 @@
get_test_property(test property VAR)
-Get a property from the Test. The value of the property is stored in
-the variable VAR. If the property is not found, VAR will be set to
-"NOTFOUND". For a list of standard properties you can type cmake
---help-property-list
+Get a property from the test. The value of the property is stored in
+the variable VAR. If the test or property is not found, VAR will be
+set to "NOTFOUND". For a list of standard properties you can type cmake
+--help-property-list.
See also the more general get_property() command.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/command/if.rst
new/cmake-3.1.1/Help/command/if.rst
--- old/cmake-3.1.0/Help/command/if.rst 2014-12-15 21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/command/if.rst 2015-01-21 15:10:25.000000000 +0100
@@ -42,11 +42,12 @@
or a non-zero number. False if the constant is ``0``, ``OFF``,
``NO``, ``FALSE``, ``N``, ``IGNORE``, ``NOTFOUND``, the empty string,
or ends in the suffix ``-NOTFOUND``. Named boolean constants are
- case-insensitive. If the argument is not one of these constants, it
- is treated as a variable.
+ case-insensitive. If the argument is not one of these specific
+ constants, it is treated as a variable or string and the following
+ signature is used.
-``if(<variable>)``
- True if the variable is defined to a value that is not a false
+``if(<variable|string>)``
+ True if given a variable that is defined to a value that is not a false
constant. False otherwise. (Note macro arguments are not variables.)
``if(NOT <expression>)``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/command/set_tests_properties.rst
new/cmake-3.1.1/Help/command/set_tests_properties.rst
--- old/cmake-3.1.0/Help/command/set_tests_properties.rst 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/command/set_tests_properties.rst 2015-01-21
15:10:25.000000000 +0100
@@ -7,7 +7,7 @@
set_tests_properties(test1 [test2...] PROPERTIES prop1 value1 prop2 value2)
-Set a property for the tests. If the property is not found, CMake
+Set a property for the tests. If the test is not found, CMake
will report an error. Generator expressions will be expanded the same
as supported by the test's add_test call. The properties include:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/generator/MSYS Makefiles.rst
new/cmake-3.1.1/Help/generator/MSYS Makefiles.rst
--- old/cmake-3.1.0/Help/generator/MSYS Makefiles.rst 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/generator/MSYS Makefiles.rst 2015-01-21
15:10:25.000000000 +0100
@@ -1,7 +1,11 @@
MSYS Makefiles
--------------
-Generates MSYS makefiles.
+Generates makefiles for use with MSYS ``make`` under the MSYS shell.
-The makefiles use /bin/sh as the shell. They require msys to be
-installed on the machine.
+Use this generator in a MSYS shell prompt and using ``make`` as the build
+tool. The generated makefiles use ``/bin/sh`` as the shell to launch build
+rules. They are not compatible with a Windows command prompt.
+
+To build under a Windows command prompt, use the
+:generator:`MinGW Makefiles` generator.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/generator/MinGW Makefiles.rst
new/cmake-3.1.1/Help/generator/MinGW Makefiles.rst
--- old/cmake-3.1.0/Help/generator/MinGW Makefiles.rst 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/generator/MinGW Makefiles.rst 2015-01-21
15:10:25.000000000 +0100
@@ -1,7 +1,12 @@
MinGW Makefiles
---------------
-Generates a make file for use with mingw32-make.
+Generates makefiles for use with ``mingw32-make`` under a Windows command
+prompt.
-The makefiles generated use cmd.exe as the shell. They do not require
-msys or a unix shell.
+Use this generator under a Windows command prompt with MinGW in the ``PATH``
+and using ``mingw32-make`` as the build tool. The generated makefiles use
+``cmd.exe`` as the shell to launch build rules. They are not compatible with
+MSYS or a unix shell.
+
+To build under the MSYS shell, use the :generator:`MSYS Makefiles` generator.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/manual/LINKS.txt
new/cmake-3.1.1/Help/manual/LINKS.txt
--- old/cmake-3.1.0/Help/manual/LINKS.txt 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Help/manual/LINKS.txt 2015-01-21 15:10:25.000000000
+0100
@@ -11,12 +11,12 @@
A Wiki is provided containing answers to frequently asked questions.
Online Documentation
- http://www.cmake.org/HTML/Documentation.html
+ http://www.cmake.org/documentation
Links to available documentation may be found on this web page.
Mailing List
- http://www.cmake.org/HTML/MailingLists.html
+ http://www.cmake.org/mailing-lists
For help and discussion about using cmake, a mailing list is
provided at cm...@cmake.org. The list is member-post-only but one
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/manual/cmake-variables.7.rst
new/cmake-3.1.1/Help/manual/cmake-variables.7.rst
--- old/cmake-3.1.0/Help/manual/cmake-variables.7.rst 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/manual/cmake-variables.7.rst 2015-01-21
15:10:25.000000000 +0100
@@ -36,6 +36,7 @@
/variable/CMAKE_EXECUTABLE_SUFFIX
/variable/CMAKE_EXTRA_GENERATOR
/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES
+ /variable/CMAKE_FIND_PACKAGE_NAME
/variable/CMAKE_GENERATOR
/variable/CMAKE_GENERATOR_PLATFORM
/variable/CMAKE_GENERATOR_TOOLSET
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
new/cmake-3.1.1/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
--- old/cmake-3.1.0/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst 2015-01-21
15:10:25.000000000 +0100
@@ -130,9 +130,11 @@
.. _N1987: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1987.htm
``cxx_final``
- Override control ``final`` keyword, as defined in N2928_.
+ Override control ``final`` keyword, as defined in N2928_, N3206_ and N3272_.
.. _N2928: http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm
+ .. _N3206: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm
+ .. _N3272: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm
``cxx_func_identifier``
Predefined ``__func__`` identifier, as defined in N2340_.
@@ -195,9 +197,12 @@
.. _N2431: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf
``cxx_override``
- Override control ``override`` keyword, as defined in N2928_.
+ Override control ``override`` keyword, as defined in N2928_, N3206_
+ and N3272_.
.. _N2928: http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm
+ .. _N3206: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm
+ .. _N3272: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm
``cxx_range_for``
Range-based for, as defined in N2930_.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/prop_tgt/CXX_STANDARD.rst
new/cmake-3.1.1/Help/prop_tgt/CXX_STANDARD.rst
--- old/cmake-3.1.0/Help/prop_tgt/CXX_STANDARD.rst 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Help/prop_tgt/CXX_STANDARD.rst 2015-01-21
15:10:25.000000000 +0100
@@ -7,7 +7,7 @@
to build this target. For some compilers, this results in adding a
flag such as ``-std=gnu++11`` to the compile line.
-Supported values are ``98`` and ``11``.
+Supported values are ``98``, ``11`` and ``14``.
If the value requested does not result in a compile flag being added for
the compiler in use, a previous standard flag will be added instead. This
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/prop_tgt/TYPE.rst
new/cmake-3.1.1/Help/prop_tgt/TYPE.rst
--- old/cmake-3.1.0/Help/prop_tgt/TYPE.rst 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Help/prop_tgt/TYPE.rst 2015-01-21 15:10:25.000000000
+0100
@@ -5,4 +5,5 @@
This read-only property can be used to test the type of the given
target. It will be one of STATIC_LIBRARY, MODULE_LIBRARY,
-SHARED_LIBRARY, EXECUTABLE or one of the internal target types.
+SHARED_LIBRARY, INTERFACE_LIBRARY, EXECUTABLE or one of the internal
+target types.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Help/release/3.1.0.rst
new/cmake-3.1.1/Help/release/3.1.0.rst
--- old/cmake-3.1.0/Help/release/3.1.0.rst 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Help/release/3.1.0.rst 2015-01-21 15:10:25.000000000
+0100
@@ -353,6 +353,28 @@
CMake 3.1 again requires the quotes for this to work correctly.
+* Prior to CMake 3.1 the Makefile generators did not escape ``#``
+ correctly inside make variable assignments used in generated
+ makefiles, causing them to be treated as comments. This made
+ code like::
+
+ add_compile_options(-Wno-#pragma-messages)
+
+ not work in Makefile generators, but work in other generators.
+ Now it is escaped correctly, making the behavior consistent
+ across generators. However, some projects may have tried to
+ workaround the original bug with code like::
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-\\#pragma-messages")
+
+ This added the needed escape for Makefile generators but also
+ caused other generators to pass ``-Wno-\#pragma-messages`` to
+ the shell, which would work only in POSIX shells.
+ Unfortunately the escaping fix could not be made in a compatible
+ way so this platform- and generator-specific workaround no
+ longer works. Project code may test the :variable:`CMAKE_VERSION`
+ variable value to make the workaround version-specific too.
+
* Callbacks established by the :command:`variable_watch` command will no
longer receive the ``ALLOWED_UNKNOWN_READ_ACCESS`` access type when
the undocumented ``CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS`` variable is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst
new/cmake-3.1.1/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst
--- old/cmake-3.1.0/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst 2015-01-21
15:10:25.000000000 +0100
@@ -0,0 +1,6 @@
+CMAKE_FIND_PACKAGE_NAME
+-----------------------
+
+Defined by the :command:`find_package` command while loading
+a find module to record the caller-specified package name.
+See command documentation for details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/CMakeCCompilerId.c.in
new/cmake-3.1.1/Modules/CMakeCCompilerId.c.in
--- old/cmake-3.1.0/Modules/CMakeCCompilerId.c.in 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Modules/CMakeCCompilerId.c.in 2015-01-21
15:10:26.000000000 +0100
@@ -18,7 +18,7 @@
#endif
#ifdef __QNXNTO__
-char const* qnxnto = "INFO" ":" "qnxnto";
+char const* qnxnto = "INFO" ":" "qnxnto[]";
#endif
@CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/CMakeCXXCompilerId.cpp.in
new/cmake-3.1.1/Modules/CMakeCXXCompilerId.cpp.in
--- old/cmake-3.1.0/Modules/CMakeCXXCompilerId.cpp.in 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Modules/CMakeCXXCompilerId.cpp.in 2015-01-21
15:10:26.000000000 +0100
@@ -17,7 +17,7 @@
#endif
#ifdef __QNXNTO__
-char const* qnxnto = "INFO" ":" "qnxnto";
+char const* qnxnto = "INFO" ":" "qnxnto[]";
#endif
@CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/CMakeDetermineCompilerId.cmake
new/cmake-3.1.1/Modules/CMakeDetermineCompilerId.cmake
--- old/cmake-3.1.0/Modules/CMakeDetermineCompilerId.cmake 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Modules/CMakeDetermineCompilerId.cmake 2015-01-21
15:10:26.000000000 +0100
@@ -270,11 +270,6 @@
else()
set(id_sdkroot "")
endif()
- if(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY)
- set(id_code_sign_identity "CODE_SIGN_IDENTITY =
\"${CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY}\";")
- else()
- set(id_code_sign_identity "")
- endif()
if(NOT ${XCODE_VERSION} VERSION_LESS 3)
set(v 3)
set(ext xcodeproj)
@@ -445,7 +440,7 @@
string(REGEX REPLACE "^0+([0-9])" "\\1" SIMULATE_VERSION
"${CMAKE_MATCH_1}")
string(REGEX REPLACE "\\.0+([0-9])" ".\\1" SIMULATE_VERSION
"${SIMULATE_VERSION}")
endif()
- if("${info}" MATCHES "INFO:qnxnto")
+ if("${info}" MATCHES "INFO:qnxnto\\[\\]")
set(COMPILER_QNXNTO 1)
endif()
endforeach()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/CPackComponent.cmake
new/cmake-3.1.1/Modules/CPackComponent.cmake
--- old/cmake-3.1.0/Modules/CPackComponent.cmake 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Modules/CPackComponent.cmake 2015-01-21
15:10:26.000000000 +0100
@@ -110,7 +110,7 @@
#
# DESCRIPTION is an extended description of the component, used in
# graphical installers to give the user additional information about the
-# component. Descriptions can span multiple lines using "\n" as the
+# component. Descriptions can span multiple lines using ``\n`` as the
# line separator. Typically, these descriptions should be no more than
# a few lines long.
#
@@ -185,7 +185,7 @@
# DESCRIPTION is an extended description of the component group, used in
# graphical installers to give the user additional information about the
# components within that group. Descriptions can span multiple lines
-# using "\n" as the line separator. Typically, these descriptions
+# using ``\n`` as the line separator. Typically, these descriptions
# should be no more than a few lines long.
#
# PARENT_GROUP, if supplied, names the parent group of this group.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/CompilerId/Xcode-3.pbxproj.in
new/cmake-3.1.1/Modules/CompilerId/Xcode-3.pbxproj.in
--- old/cmake-3.1.0/Modules/CompilerId/Xcode-3.pbxproj.in 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Modules/CompilerId/Xcode-3.pbxproj.in 2015-01-21
15:10:26.000000000 +0100
@@ -81,7 +81,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ONLY_ACTIVE_ARCH = YES;
- @id_code_sign_identity@
+ CODE_SIGNING_REQUIRED = NO;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
SYMROOT = .;
@id_toolset@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/FindBoost.cmake
new/cmake-3.1.1/Modules/FindBoost.cmake
--- old/cmake-3.1.0/Modules/FindBoost.cmake 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Modules/FindBoost.cmake 2015-01-21 15:10:26.000000000
+0100
@@ -478,7 +478,7 @@
# The user has not requested an exact version. Among known
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.56.0" "1.56" "1.55.0" "1.55" "1.54.0" "1.54"
+ "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" "1.54.0"
"1.54"
"1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
"1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
"1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0"
"1.42"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/FindCUDA.cmake
new/cmake-3.1.1/Modules/FindCUDA.cmake
--- old/cmake-3.1.0/Modules/FindCUDA.cmake 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Modules/FindCUDA.cmake 2015-01-21 15:10:26.000000000
+0100
@@ -613,7 +613,7 @@
set(CUDA_VERSION_STRING "${CUDA_VERSION}")
# Support for arm cross compilation with CUDA 5.5
-if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND
${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND EXISTS
"${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-gnueabihf")
+if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND
CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND EXISTS
"${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-gnueabihf")
set(CUDA_TOOLKIT_TARGET_DIR
"${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-gnueabihf" CACHE PATH "Toolkit
target location.")
else()
set(CUDA_TOOLKIT_TARGET_DIR "${CUDA_TOOLKIT_ROOT_DIR}" CACHE PATH "Toolkit
target location.")
@@ -621,7 +621,7 @@
mark_as_advanced(CUDA_TOOLKIT_TARGET_DIR)
# Target CPU architecture
-if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND
${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND
CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
set(_cuda_target_cpu_arch_initial "ARM")
else()
set(_cuda_target_cpu_arch_initial "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/FindIce.cmake
new/cmake-3.1.1/Modules/FindIce.cmake
--- old/cmake-3.1.0/Modules/FindIce.cmake 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Modules/FindIce.cmake 2015-01-21 15:10:26.000000000
+0100
@@ -282,21 +282,21 @@
PATH_SUFFIXES ${ice_library_suffixes}
DOC "Ice ${component} library")
mark_as_advanced("${component_cache}")
- if("${component_cache}")
+ if(${component_cache})
set("${component_found}" ON)
list(APPEND Ice_LIBRARY "${${component_cache}}")
endif()
mark_as_advanced("${component_found}")
set("${component_cache}" "${${component_cache}}" PARENT_SCOPE)
set("${component_found}" "${${component_found}}" PARENT_SCOPE)
- if("${component_found}")
- if ("Ice_FIND_REQUIRED_${component}")
+ if(${component_found})
+ if (Ice_FIND_REQUIRED_${component})
list(APPEND Ice_LIBS_FOUND "${component} (required)")
else()
list(APPEND Ice_LIBS_FOUND "${component} (optional)")
endif()
else()
- if ("Ice_FIND_REQUIRED_${component}")
+ if (Ice_FIND_REQUIRED_${component})
set(Ice_REQUIRED_LIBS_FOUND OFF)
list(APPEND Ice_LIBS_NOTFOUND "${component} (required)")
else()
@@ -356,7 +356,7 @@
set(_Ice_component_cache "Ice_${_Ice_component_upcase}_LIBRARY")
set(_Ice_component_lib "Ice_${_Ice_component_upcase}_LIBRARIES")
set(_Ice_component_found "${_Ice_component_upcase}_FOUND")
- if("${_Ice_component_found}")
+ if(${_Ice_component_found})
set("${_Ice_component_lib}" "${${_Ice_component_cache}}")
endif()
unset(_Ice_component_upcase)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/FindQt.cmake
new/cmake-3.1.1/Modules/FindQt.cmake
--- old/cmake-3.1.0/Modules/FindQt.cmake 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Modules/FindQt.cmake 2015-01-21 15:10:26.000000000
+0100
@@ -13,6 +13,9 @@
# or FindQt4 module is included. Once the user sets DESIRED_QT_VERSION,
# then the FindQt3 or FindQt4 module is included.
#
+# This module can only detect and switch between Qt versions 3 and 4. It
+# cannot handle Qt5 or any later versions.
+#
# ::
#
# QT_REQUIRED if this is set to TRUE then if CMake can
@@ -79,7 +82,11 @@
set(GLOB_TEMP_VAR)
if (Qt_FIND_VERSION)
- set(DESIRED_QT_VERSION "${Qt_FIND_VERSION}")
+ if (Qt_FIND_VERSION MATCHES "^([34])(\\.[0-9]+.*)?$")
+ set(DESIRED_QT_VERSION ${CMAKE_MATCH_1})
+ else ()
+ message(FATAL_ERROR "FindQt was called with invalid version
'${Qt_FIND_VERSION}'. Only Qt major versions 3 or 4 are supported. If you do
not need to support both Qt3 and Qt4 in your source consider calling
find_package(Qt3) or find_package(Qt4) instead of find_package(Qt) instead.")
+ endif ()
endif ()
# now find qmake
@@ -179,9 +186,9 @@
endif()
if(NOT QT_FOUND AND DESIRED_QT_VERSION)
if(QT_REQUIRED)
- message(FATAL_ERROR "CMake was unable to find Qt version:
${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and
QT${DESIRED_QT_VERSION}_QGLOBAL_FILE, if those are set then QT_QT_LIBRARY or
QT_LIBRARY_DIR.")
+ message(FATAL_ERROR "CMake was unable to find Qt version:
${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and
QT${DESIRED_QT_VERSION}_QGLOBAL_H_FILE, if those are set then QT_QT_LIBRARY or
QT_LIBRARY_DIR.")
else()
- message( "CMake was unable to find desired Qt version:
${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and
QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.")
+ message( "CMake was unable to find desired Qt version:
${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and
QT${DESIRED_QT_VERSION}_QGLOBAL_H_FILE.")
endif()
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/FindRuby.cmake
new/cmake-3.1.1/Modules/FindRuby.cmake
--- old/cmake-3.1.0/Modules/FindRuby.cmake 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Modules/FindRuby.cmake 2015-01-21 15:10:26.000000000
+0100
@@ -58,7 +58,7 @@
set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
-if(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR)
+if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
set(Ruby_FIND_VERSION_SHORT_NODOT
"${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
# we can't construct that if only major version is given
set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
@@ -90,7 +90,7 @@
RESULT_VARIABLE _RUBY_SUCCESS
OUTPUT_VARIABLE _RUBY_OUTPUT
ERROR_QUIET)
- if(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT)
+ if(_RUBY_SUCCESS OR _RUBY_OUTPUT STREQUAL "")
execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print
Config::CONFIG['${RBVAR}']"
RESULT_VARIABLE _RUBY_SUCCESS
OUTPUT_VARIABLE _RUBY_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/FindSDL.cmake
new/cmake-3.1.1/Modules/FindSDL.cmake
--- old/cmake-3.1.0/Modules/FindSDL.cmake 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Modules/FindSDL.cmake 2015-01-21 15:10:26.000000000
+0100
@@ -106,7 +106,7 @@
)
if(NOT SDL_BUILDING_LIBRARY)
- if(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+ if(NOT SDL_INCLUDE_DIR MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to
# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
# seem to provide SDLmain for compatibility even though they don't
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/Platform/Linux-XL-C.cmake
new/cmake-3.1.1/Modules/Platform/Linux-XL-C.cmake
--- old/cmake-3.1.0/Modules/Platform/Linux-XL-C.cmake 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Modules/Platform/Linux-XL-C.cmake 2015-01-21
15:10:26.000000000 +0100
@@ -1 +1,2 @@
set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-qmkshrobj")
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-export-dynamic")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/Platform/Linux-XL-CXX.cmake
new/cmake-3.1.1/Modules/Platform/Linux-XL-CXX.cmake
--- old/cmake-3.1.0/Modules/Platform/Linux-XL-CXX.cmake 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Modules/Platform/Linux-XL-CXX.cmake 2015-01-21
15:10:26.000000000 +0100
@@ -1 +1,2 @@
set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-qmkshrobj")
+set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "-Wl,-export-dynamic")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Modules/Platform/Linux-XL-Fortran.cmake
new/cmake-3.1.1/Modules/Platform/Linux-XL-Fortran.cmake
--- old/cmake-3.1.0/Modules/Platform/Linux-XL-Fortran.cmake 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Modules/Platform/Linux-XL-Fortran.cmake 2015-01-21
15:10:26.000000000 +0100
@@ -1 +1,2 @@
set(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-qmkshrobj")
+set(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-Wl,-export-dynamic")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/CMakeVersion.cmake
new/cmake-3.1.1/Source/CMakeVersion.cmake
--- old/cmake-3.1.0/Source/CMakeVersion.cmake 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Source/CMakeVersion.cmake 2015-01-21 15:10:26.000000000
+0100
@@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 1)
-set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_PATCH 1)
#set(CMake_VERSION_RC 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/CPack/cmCPackGenerator.cxx
new/cmake-3.1.1/Source/CPack/cmCPackGenerator.cxx
--- old/cmake-3.1.0/Source/CPack/cmCPackGenerator.cxx 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/CPack/cmCPackGenerator.cxx 2015-01-21
15:10:26.000000000 +0100
@@ -628,6 +628,14 @@
cmGlobalGenerator* globalGenerator
= this->MakefileMap->GetCMakeInstance()->CreateGlobalGenerator(
cmakeGenerator);
+ if ( !globalGenerator )
+ {
+ cmCPackLogger(cmCPackLog::LOG_ERROR,
+ "Specified package generator not found. "
+ "CPACK_CMAKE_GENERATOR value is invalid."
+ << std::endl);
+ return 0;
+ }
// set the global flag for unix style paths on cmSystemTools as
// soon as the generator is set. This allows gmake to be used
// on windows.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Source/CPack/cmCPackPackageMakerGenerator.cxx
new/cmake-3.1.1/Source/CPack/cmCPackPackageMakerGenerator.cxx
--- old/cmake-3.1.0/Source/CPack/cmCPackPackageMakerGenerator.cxx
2014-12-15 21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/CPack/cmCPackPackageMakerGenerator.cxx
2015-01-21 15:10:26.000000000 +0100
@@ -24,11 +24,20 @@
#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <assert.h>
+
+static inline
+unsigned int getVersion(unsigned int major, unsigned int minor)
+{
+ assert(major < 256 && minor < 256);
+ return ((major & 0xFF) << 16 | minor);
+}
+
//----------------------------------------------------------------------
cmCPackPackageMakerGenerator::cmCPackPackageMakerGenerator()
{
this->PackageMakerVersion = 0.0;
- this->PackageCompatibilityVersion = 10.4;
+ this->PackageCompatibilityVersion = getVersion(10, 4);
}
//----------------------------------------------------------------------
@@ -39,7 +48,7 @@
//----------------------------------------------------------------------
bool cmCPackPackageMakerGenerator::SupportsComponentInstallation() const
{
- return this->PackageCompatibilityVersion >= 10.4;
+ return this->PackageCompatibilityVersion >= getVersion(10, 4);
}
//----------------------------------------------------------------------
@@ -241,7 +250,7 @@
std::string packageFile;
if (compIt->second.IsDownloaded)
{
- if (this->PackageCompatibilityVersion >= 10.5 &&
+ if (this->PackageCompatibilityVersion >= getVersion(10, 5) &&
this->PackageMakerVersion >= 3.0)
{
// Build this package within the upload directory.
@@ -260,7 +269,7 @@
}
else if (!warnedAboutDownloadCompatibility)
{
- if (this->PackageCompatibilityVersion < 10.5)
+ if (this->PackageCompatibilityVersion < getVersion(10, 5))
{
cmCPackLogger(
cmCPackLog::LOG_WARNING,
@@ -520,22 +529,29 @@
const char *packageCompat = this->GetOption("CPACK_OSX_PACKAGE_VERSION");
if (packageCompat && *packageCompat)
{
- this->PackageCompatibilityVersion = atof(packageCompat);
+ unsigned int majorVersion = 10;
+ unsigned int minorVersion = 5;
+ int res = sscanf(packageCompat, "%u.%u", &majorVersion, &minorVersion);
+ if (res == 2)
+ {
+ this->PackageCompatibilityVersion =
+ getVersion(majorVersion, minorVersion);
+ }
}
else if (this->GetOption("CPACK_DOWNLOAD_SITE"))
{
this->SetOption("CPACK_OSX_PACKAGE_VERSION", "10.5");
- this->PackageCompatibilityVersion = 10.5;
+ this->PackageCompatibilityVersion = getVersion(10, 5);
}
else if (this->GetOption("CPACK_COMPONENTS_ALL"))
{
this->SetOption("CPACK_OSX_PACKAGE_VERSION", "10.4");
- this->PackageCompatibilityVersion = 10.4;
+ this->PackageCompatibilityVersion = getVersion(10, 4);
}
else
{
this->SetOption("CPACK_OSX_PACKAGE_VERSION", "10.3");
- this->PackageCompatibilityVersion = 10.3;
+ this->PackageCompatibilityVersion = getVersion(10, 3);
}
std::vector<std::string> no_paths;
@@ -712,7 +728,7 @@
// The command that will be used to run PackageMaker
cmOStringStream pkgCmd;
- if (this->PackageCompatibilityVersion < 10.5 ||
+ if (this->PackageCompatibilityVersion < getVersion(10, 5) ||
this->PackageMakerVersion < 3.0)
{
// Create Description.plist and Info.plist files for normal Mac OS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Source/CPack/cmCPackPackageMakerGenerator.h
new/cmake-3.1.1/Source/CPack/cmCPackPackageMakerGenerator.h
--- old/cmake-3.1.0/Source/CPack/cmCPackPackageMakerGenerator.h 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/CPack/cmCPackPackageMakerGenerator.h 2015-01-21
15:10:26.000000000 +0100
@@ -117,7 +117,7 @@
cmCPackComponent PostFlightComponent;
double PackageMakerVersion;
- double PackageCompatibilityVersion;
+ unsigned int PackageCompatibilityVersion;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmComputeLinkDepends.cxx
new/cmake-3.1.1/Source/cmComputeLinkDepends.cxx
--- old/cmake-3.1.0/Source/cmComputeLinkDepends.cxx 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmComputeLinkDepends.cxx 2015-01-21
15:10:26.000000000 +0100
@@ -266,9 +266,10 @@
// Iterate in reverse order so we can keep only the last occurrence
// of a shared library.
std::set<int> emmitted;
+ const std::vector<int>& cFLO = this->FinalLinkOrder;
for(std::vector<int>::const_reverse_iterator
- li = this->FinalLinkOrder.rbegin(),
- le = this->FinalLinkOrder.rend();
+ li = cFLO.rbegin(),
+ le = cFLO.rend();
li != le; ++li)
{
int i = *li;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmExtraEclipseCDT4Generator.cxx
new/cmake-3.1.1/Source/cmExtraEclipseCDT4Generator.cxx
--- old/cmake-3.1.0/Source/cmExtraEclipseCDT4Generator.cxx 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmExtraEclipseCDT4Generator.cxx 2015-01-21
15:10:26.000000000 +0100
@@ -62,6 +62,7 @@
if (*lit == "CXX")
{
this->Natures.insert("org.eclipse.cdt.core.ccnature");
+ this->Natures.insert("org.eclipse.cdt.core.cnature");
}
else if (*lit == "C")
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Source/cmGeneratorExpressionEvaluator.cxx
new/cmake-3.1.1/Source/cmGeneratorExpressionEvaluator.cxx
--- old/cmake-3.1.0/Source/cmGeneratorExpressionEvaluator.cxx 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmGeneratorExpressionEvaluator.cxx 2015-01-21
15:10:26.000000000 +0100
@@ -1373,10 +1373,17 @@
for (LangMap::const_iterator lit = testedFeatures.begin();
lit != testedFeatures.end(); ++lit)
{
+ std::vector<std::string> const& langAvailable
+ = availableFeatures[lit->first];
for (std::vector<std::string>::const_iterator it = lit->second.begin();
it != lit->second.end(); ++it)
{
- if (!context->Makefile->HaveFeatureAvailable(target,
+ if (std::find(langAvailable.begin(), langAvailable.end(), *it)
+ == langAvailable.end())
+ {
+ return "0";
+ }
+ if (!context->Makefile->HaveStandardAvailable(target,
lit->first, *it))
{
if (evalLL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmGetTargetPropertyCommand.cxx
new/cmake-3.1.1/Source/cmGetTargetPropertyCommand.cxx
--- old/cmake-3.1.0/Source/cmGetTargetPropertyCommand.cxx 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmGetTargetPropertyCommand.cxx 2015-01-21
15:10:26.000000000 +0100
@@ -23,6 +23,7 @@
std::string var = args[0];
const std::string& targetName = args[1];
std::string prop;
+ bool prop_exists = false;
if(args[2] == "ALIASED_TARGET")
{
@@ -32,6 +33,7 @@
this->Makefile->FindTargetToUse(targetName))
{
prop = target->GetName();
+ prop_exists = true;
}
}
}
@@ -42,6 +44,7 @@
if(prop_cstr)
{
prop = prop_cstr;
+ prop_exists = true;
}
}
else
@@ -74,7 +77,7 @@
}
}
}
- if (!prop.empty())
+ if (prop_exists)
{
this->Makefile->AddDefinition(var, prop.c_str());
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmGlobalXCodeGenerator.cxx
new/cmake-3.1.1/Source/cmGlobalXCodeGenerator.cxx
--- old/cmake-3.1.0/Source/cmGlobalXCodeGenerator.cxx 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmGlobalXCodeGenerator.cxx 2015-01-21
15:10:26.000000000 +0100
@@ -966,16 +966,40 @@
};
//----------------------------------------------------------------------------
-void
+struct cmCompareTargets
+{
+ bool operator () (std::string const& a, std::string const& b) const
+ {
+ if (a == "ALL_BUILD")
+ {
+ return true;
+ }
+ if (b == "ALL_BUILD")
+ {
+ return false;
+ }
+ return strcmp(a.c_str(), b.c_str()) < 0;
+ }
+};
+
+//----------------------------------------------------------------------------
+bool
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
std::vector<cmXCodeObject*>&
targets)
{
this->SetCurrentLocalGenerator(gen);
cmTargets &tgts = this->CurrentMakefile->GetTargets();
+ typedef std::map<std::string, cmTarget*, cmCompareTargets> cmSortedTargets;
+ cmSortedTargets sortedTargets;
for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
{
- cmTarget& cmtarget = l->second;
+ sortedTargets[l->first] = &l->second;
+ }
+ for(cmSortedTargets::iterator l = sortedTargets.begin();
+ l != sortedTargets.end(); l++)
+ {
+ cmTarget& cmtarget = *l->second;
cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
// make sure ALL_BUILD, INSTALL, etc are only done once
@@ -992,7 +1016,12 @@
if(cmtarget.GetType() == cmTarget::UTILITY ||
cmtarget.GetType() == cmTarget::GLOBAL_TARGET)
{
- targets.push_back(this->CreateUtilityTarget(cmtarget));
+ cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
+ if (!t)
+ {
+ return false;
+ }
+ targets.push_back(t);
continue;
}
@@ -1000,7 +1029,7 @@
std::vector<cmSourceFile*> classes;
if (!cmtarget.GetConfigCommonSourceFiles(classes))
{
- return;
+ return false;
}
std::sort(classes.begin(), classes.end(), cmSourceFilePathCompare());
@@ -1227,6 +1256,7 @@
targets.push_back(this->CreateXCodeTarget(cmtarget, buildPhases));
}
+ return true;
}
//----------------------------------------------------------------------------
@@ -2940,7 +2970,7 @@
}
//----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
+bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>&
generators)
{
@@ -2983,7 +3013,7 @@
std::vector<cmSourceFile*> classes;
if (!cmtarget.GetConfigCommonSourceFiles(classes))
{
- return;
+ return false;
}
// Put cmSourceFile instances in proper groups:
for(std::vector<cmSourceFile*>::const_iterator s = classes.begin();
@@ -3016,6 +3046,7 @@
}
}
}
+ return true;
}
cmXCodeObject *cmGlobalXCodeGenerator
@@ -3136,7 +3167,7 @@
}
//----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator
+bool cmGlobalXCodeGenerator
::CreateXCodeObjects(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>&
generators)
@@ -3217,7 +3248,10 @@
this->MainGroupChildren->AddObject(resourcesGroup);
// now create the cmake groups
- this->CreateGroups(root, generators);
+ if (!this->CreateGroups(root, generators))
+ {
+ return false;
+ }
cmXCodeObject* productGroup = this->CreateObject(cmXCodeObject::PBXGroup);
productGroup->AddAttribute("name", this->CreateString("Products"));
@@ -3417,7 +3451,10 @@
{
if(!this->IsExcluded(root, *i))
{
- this->CreateXCodeTargets(*i, targets);
+ if (!this->CreateXCodeTargets(*i, targets))
+ {
+ return false;
+ }
}
}
// loop over all targets and add link and depend info
@@ -3446,6 +3483,7 @@
}
}
this->RootObject->AddAttribute("targets", allTargets);
+ return true;
}
//----------------------------------------------------------------------------
@@ -3632,8 +3670,10 @@
}
}
- this->CreateXCodeObjects(root,
- generators);
+ if (!this->CreateXCodeObjects(root, generators))
+ {
+ return;
+ }
std::string xcodeDir = root->GetMakefile()->GetStartOutputDirectory();
xcodeDir += "/";
xcodeDir += root->GetMakefile()->GetProjectName();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmGlobalXCodeGenerator.h
new/cmake-3.1.1/Source/cmGlobalXCodeGenerator.h
--- old/cmake-3.1.0/Source/cmGlobalXCodeGenerator.h 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmGlobalXCodeGenerator.h 2015-01-21
15:10:26.000000000 +0100
@@ -91,7 +91,7 @@
cmSourceGroup* sg);
cmXCodeObject* CreatePBXGroup(cmXCodeObject *parent,
std::string name);
- void CreateGroups(cmLocalGenerator* root,
+ bool CreateGroups(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>&
generators);
std::string XCodeEscapePath(const char* p);
@@ -151,7 +151,7 @@
std::string ExtractFlag(const char* flag, std::string& flags);
// delete all objects in the this->XCodeObjects vector.
void ClearXCodeObjects();
- void CreateXCodeObjects(cmLocalGenerator* root,
+ bool CreateXCodeObjects(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
void OutputXCodeProject(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
@@ -170,7 +170,7 @@
cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen,
cmSourceFile* sf,
cmTarget& cmtarget);
- void CreateXCodeTargets(cmLocalGenerator* gen,
+ bool CreateXCodeTargets(cmLocalGenerator* gen,
std::vector<cmXCodeObject*>&);
bool IsHeaderFile(cmSourceFile*);
void AddDependTarget(cmXCodeObject* target,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmMakefile.cxx
new/cmake-3.1.1/Source/cmMakefile.cxx
--- old/cmake-3.1.0/Source/cmMakefile.cxx 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Source/cmMakefile.cxx 2015-01-21 15:10:26.000000000
+0100
@@ -5130,18 +5130,19 @@
}
//----------------------------------------------------------------------------
-bool cmMakefile::HaveFeatureAvailable(cmTarget const* target,
+bool cmMakefile::HaveStandardAvailable(cmTarget const* target,
std::string const& lang,
const std::string& feature) const
{
return lang == "C"
- ? this->HaveCFeatureAvailable(target, feature)
- : this->HaveCxxFeatureAvailable(target, feature);
+ ? this->HaveCStandardAvailable(target, feature)
+ : this->HaveCxxStandardAvailable(target, feature);
}
//----------------------------------------------------------------------------
bool cmMakefile::
-HaveCFeatureAvailable(cmTarget const* target, const std::string& feature) const
+HaveCStandardAvailable(cmTarget const* target,
+ const std::string& feature) const
{
bool needC90 = false;
bool needC99 = false;
@@ -5218,7 +5219,7 @@
}
//----------------------------------------------------------------------------
-bool cmMakefile::HaveCxxFeatureAvailable(cmTarget const* target,
+bool cmMakefile::HaveCxxStandardAvailable(cmTarget const* target,
const std::string& feature) const
{
bool needCxx98 = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmMakefile.h
new/cmake-3.1.1/Source/cmMakefile.h
--- old/cmake-3.1.0/Source/cmMakefile.h 2014-12-15 21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmMakefile.h 2015-01-21 15:10:26.000000000 +0100
@@ -935,7 +935,7 @@
const char* CompileFeaturesAvailable(const std::string& lang,
std::string *error) const;
- bool HaveFeatureAvailable(cmTarget const* target, std::string const& lang,
+ bool HaveStandardAvailable(cmTarget const* target, std::string const& lang,
const std::string& feature) const;
bool IsLaterStandard(std::string const& lang,
@@ -1158,9 +1158,9 @@
void CheckNeededCxxLanguage(const std::string& feature, bool& needCxx98,
bool& needCxx11, bool& needCxx14) const;
- bool HaveCFeatureAvailable(cmTarget const* target,
+ bool HaveCStandardAvailable(cmTarget const* target,
const std::string& feature) const;
- bool HaveCxxFeatureAvailable(cmTarget const* target,
+ bool HaveCxxStandardAvailable(cmTarget const* target,
const std::string& feature) const;
mutable bool SuppressWatches;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmNinjaNormalTargetGenerator.cxx
new/cmake-3.1.1/Source/cmNinjaNormalTargetGenerator.cxx
--- old/cmake-3.1.0/Source/cmNinjaNormalTargetGenerator.cxx 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmNinjaNormalTargetGenerator.cxx 2015-01-21
15:10:26.000000000 +0100
@@ -110,13 +110,26 @@
<< "\n\n";
#endif
+ // Write rules for languages compiled in this target.
std::set<std::string> languages;
- this->GetTarget()->GetLanguages(languages,
- this->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+ std::vector<cmSourceFile*> sourceFiles;
+ this->GetTarget()->GetSourceFiles(sourceFiles,
+ this->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+ for(std::vector<cmSourceFile*>::const_iterator
+ i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
+ {
+ const std::string& lang = (*i)->GetLanguage();
+ if(!lang.empty())
+ {
+ languages.insert(lang);
+ }
+ }
for(std::set<std::string>::const_iterator l = languages.begin();
l != languages.end();
++l)
+ {
this->WriteLanguageRules(*l);
+ }
}
const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmNinjaTargetGenerator.cxx
new/cmake-3.1.1/Source/cmNinjaTargetGenerator.cxx
--- old/cmake-3.1.0/Source/cmNinjaTargetGenerator.cxx 2014-12-15
21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmNinjaTargetGenerator.cxx 2015-01-21
15:10:26.000000000 +0100
@@ -454,7 +454,10 @@
std::vector<std::string> compileCmds;
cmSystemTools::ExpandListArgument(compileCmd, compileCmds);
- compileCmds.front().insert(0, cldeps);
+ if (!compileCmds.empty())
+ {
+ compileCmds.front().insert(0, cldeps);
+ }
for (std::vector<std::string>::iterator i = compileCmds.begin();
i != compileCmds.end(); ++i)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmSourceFile.cxx
new/cmake-3.1.1/Source/cmSourceFile.cxx
--- old/cmake-3.1.0/Source/cmSourceFile.cxx 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Source/cmSourceFile.cxx 2015-01-21 15:10:26.000000000
+0100
@@ -24,7 +24,7 @@
this->CustomCommand = 0;
this->Properties.SetCMakeInstance(mf->GetCMakeInstance());
this->FindFullPathFailed = false;
- this->IsUiFile = ("ui" ==
+ this->IsUiFile = (".ui" ==
cmSystemTools::GetFilenameLastExtension(this->Location.GetName()));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/cmTarget.cxx
new/cmake-3.1.1/Source/cmTarget.cxx
--- old/cmake-3.1.0/Source/cmTarget.cxx 2014-12-15 21:07:43.000000000 +0100
+++ new/cmake-3.1.1/Source/cmTarget.cxx 2015-01-21 15:10:26.000000000 +0100
@@ -547,6 +547,7 @@
this->Internal->LinkInterfaceMap.clear();
this->Internal->LinkInterfaceUsageRequirementsOnlyMap.clear();
this->Internal->LinkClosureMap.clear();
+ this->Internal->SourceFilesMap.clear();
for (cmTargetLinkInformationMap::const_iterator it
= this->LinkInformation.begin();
it != this->LinkInformation.end(); ++it)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Source/kwsys/Terminal.c
new/cmake-3.1.1/Source/kwsys/Terminal.c
--- old/cmake-3.1.0/Source/kwsys/Terminal.c 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Source/kwsys/Terminal.c 2015-01-21 15:10:26.000000000
+0100
@@ -175,6 +175,7 @@
"xterm-88color",
"xterm-color",
"xterm-debian",
+ "xterm-termite",
0
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Tests/CMakeLists.txt
new/cmake-3.1.1/Tests/CMakeLists.txt
--- old/cmake-3.1.0/Tests/CMakeLists.txt 2014-12-15 21:07:43.000000000
+0100
+++ new/cmake-3.1.1/Tests/CMakeLists.txt 2015-01-21 15:10:26.000000000
+0100
@@ -255,6 +255,7 @@
endif()
ADD_TEST_MACRO(COnly COnly)
ADD_TEST_MACRO(CxxOnly CxxOnly)
+ ADD_TEST_MACRO(CxxSubdirC CxxSubdirC)
ADD_TEST_MACRO(IPO COnly/COnly)
ADD_TEST_MACRO(OutDir runtime/OutDir)
ADD_TEST_MACRO(ObjectLibrary UseCshared)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Tests/CxxSubdirC/CMakeLists.txt
new/cmake-3.1.1/Tests/CxxSubdirC/CMakeLists.txt
--- old/cmake-3.1.0/Tests/CxxSubdirC/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/CxxSubdirC/CMakeLists.txt 2015-01-21
15:10:27.000000000 +0100
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.0)
+project(CxxSubdirC CXX)
+add_subdirectory(Cdir)
+add_executable(CxxSubdirC main.cxx $<TARGET_OBJECTS:Cobj>)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Tests/CxxSubdirC/Cdir/CMakeLists.txt
new/cmake-3.1.1/Tests/CxxSubdirC/Cdir/CMakeLists.txt
--- old/cmake-3.1.0/Tests/CxxSubdirC/Cdir/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/CxxSubdirC/Cdir/CMakeLists.txt 2015-01-21
15:10:27.000000000 +0100
@@ -0,0 +1,2 @@
+enable_language(C)
+add_library(Cobj OBJECT Cobj.c)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Tests/CxxSubdirC/Cdir/Cobj.c
new/cmake-3.1.1/Tests/CxxSubdirC/Cdir/Cobj.c
--- old/cmake-3.1.0/Tests/CxxSubdirC/Cdir/Cobj.c 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/CxxSubdirC/Cdir/Cobj.c 2015-01-21
15:10:27.000000000 +0100
@@ -0,0 +1 @@
+int Cobj(void) { return 0; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Tests/CxxSubdirC/main.cxx
new/cmake-3.1.1/Tests/CxxSubdirC/main.cxx
--- old/cmake-3.1.0/Tests/CxxSubdirC/main.cxx 1970-01-01 01:00:00.000000000
+0100
+++ new/cmake-3.1.1/Tests/CxxSubdirC/main.cxx 2015-01-21 15:10:27.000000000
+0100
@@ -0,0 +1,2 @@
+extern "C" int Cobj(void);
+int main() { return Cobj(); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Tests/QtAutogen/CMakeLists.txt
new/cmake-3.1.1/Tests/QtAutogen/CMakeLists.txt
--- old/cmake-3.1.0/Tests/QtAutogen/CMakeLists.txt 2014-12-15
21:07:44.000000000 +0100
+++ new/cmake-3.1.1/Tests/QtAutogen/CMakeLists.txt 2015-01-21
15:10:27.000000000 +0100
@@ -73,6 +73,12 @@
add_definitions(-DTEST_DEBUG_CLASS)
endif()
+# The -no-protection option disables the generation of include guards. Verify
+# that setting the source file property has an effect by using this and
+# issue an error in the preprocessor in calwidget.cpp if the include guard
+# is defined.
+set_source_files_properties(calwidget.ui PROPERTIES AUTOUIC_OPTIONS
"-no-protection")
+
add_executable(QtAutogen main.cpp calwidget.cpp second_widget.cpp foo.cpp
blub.cpp bar.cpp abc.cpp
multiplewidgets.cpp
xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Tests/QtAutogen/calwidget.cpp
new/cmake-3.1.1/Tests/QtAutogen/calwidget.cpp
--- old/cmake-3.1.0/Tests/QtAutogen/calwidget.cpp 2014-12-15
21:07:44.000000000 +0100
+++ new/cmake-3.1.1/Tests/QtAutogen/calwidget.cpp 2015-01-21
15:10:27.000000000 +0100
@@ -50,6 +50,9 @@
#include "calwidget.h"
#include "ui_calwidget.h"
+ #ifdef UI_CALWIDGET_H
+ #error Definition of UI_CALWIDGET_H should be disabled by file option.
+ #endif
Window::Window()
: ui(new Ui::Window)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS-result.txt
new/cmake-3.1.1/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS-result.txt
---
old/cmake-3.1.0/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS-result.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/cmake-3.1.1/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS-result.txt
2015-01-21 15:10:27.000000000 +0100
@@ -0,0 +1 @@
+0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS-stderr.txt
new/cmake-3.1.1/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS-stderr.txt
---
old/cmake-3.1.0/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/cmake-3.1.1/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS-stderr.txt
2015-01-21 15:10:27.000000000 +0100
@@ -0,0 +1,12 @@
+CMake Warning \(dev\) at LOCATION-and-TARGET_OBJECTS.cmake:[0-9]+
\(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 should not be read from target "bar". Use the target
+ name directly with add_custom_command, or use the generator expression
+ \$<TARGET_FILE>, as appropriate.
+
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS.cmake
new/cmake-3.1.1/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS.cmake
--- old/cmake-3.1.0/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/CMP0026/LOCATION-and-TARGET_OBJECTS.cmake
2015-01-21 15:10:27.000000000 +0100
@@ -0,0 +1,6 @@
+
+enable_language(CXX)
+
+add_library(foo OBJECT empty.cpp)
+add_executable(bar $<TARGET_OBJECTS:foo>)
+get_target_property(location bar LOCATION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/CMP0026/RunCMakeTest.cmake
new/cmake-3.1.1/Tests/RunCMake/CMP0026/RunCMakeTest.cmake
--- old/cmake-3.1.0/Tests/RunCMake/CMP0026/RunCMakeTest.cmake 2014-12-15
21:07:44.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/CMP0026/RunCMakeTest.cmake 2015-01-21
15:10:27.000000000 +0100
@@ -10,3 +10,4 @@
run_cmake(CMP0026-LOCATION-CONFIG-OLD)
run_cmake(CMP0026-LOCATION-CONFIG-WARN)
run_cmake(ObjlibNotDefined)
+run_cmake(LOCATION-and-TARGET_OBJECTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/Tests/RunCMake/CMakeLists.txt
new/cmake-3.1.1/Tests/RunCMake/CMakeLists.txt
--- old/cmake-3.1.0/Tests/RunCMake/CMakeLists.txt 2014-12-15
21:07:44.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/CMakeLists.txt 2015-01-21
15:10:27.000000000 +0100
@@ -102,6 +102,7 @@
add_RunCMake_test(file)
add_RunCMake_test(find_package)
add_RunCMake_test(get_filename_component)
+add_RunCMake_test(get_property)
add_RunCMake_test(if)
add_RunCMake_test(include)
add_RunCMake_test(include_directories)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/CMakeLists.txt
new/cmake-3.1.1/Tests/RunCMake/get_property/CMakeLists.txt
--- old/cmake-3.1.0/Tests/RunCMake/get_property/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/CMakeLists.txt 2015-01-21
15:10:28.000000000 +0100
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/RunCMakeTest.cmake
new/cmake-3.1.1/Tests/RunCMake/get_property/RunCMakeTest.cmake
--- old/cmake-3.1.0/Tests/RunCMake/get_property/RunCMakeTest.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/RunCMakeTest.cmake
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,9 @@
+include(RunCMake)
+
+run_cmake(cache_properties)
+run_cmake(directory_properties)
+run_cmake(global_properties)
+run_cmake(install_properties)
+run_cmake(source_properties)
+run_cmake(target_properties)
+run_cmake(test_properties)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/cache_properties-stderr.txt
new/cmake-3.1.1/Tests/RunCMake/get_property/cache_properties-stderr.txt
--- old/cmake-3.1.0/Tests/RunCMake/get_property/cache_properties-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/cache_properties-stderr.txt
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,3 @@
+^get_property: --><--
+get_property: -->TRUE<--
+get_property: --><--$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/cache_properties.cmake
new/cmake-3.1.1/Tests/RunCMake/get_property/cache_properties.cmake
--- old/cmake-3.1.0/Tests/RunCMake/get_property/cache_properties.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/cache_properties.cmake
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,15 @@
+function (check_cache_property var prop)
+ get_property(gp_val
+ CACHE "${var}"
+ PROPERTY "${prop}")
+
+ message("get_property: -->${gp_val}<--")
+endfunction ()
+
+set(var val CACHE STRING "doc")
+set_property(CACHE var PROPERTY VALUE "") # empty
+set_property(CACHE var PROPERTY ADVANCED TRUE)
+
+check_cache_property(var VALUE)
+check_cache_property(var ADVANCED)
+check_cache_property(var noexist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/directory_properties-stderr.txt
new/cmake-3.1.1/Tests/RunCMake/get_property/directory_properties-stderr.txt
--- old/cmake-3.1.0/Tests/RunCMake/get_property/directory_properties-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/directory_properties-stderr.txt
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,6 @@
+^get_directory_property: --><--
+get_property: --><--
+get_directory_property: -->value<--
+get_property: -->value<--
+get_directory_property: --><--
+get_property: --><--$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/directory_properties.cmake
new/cmake-3.1.1/Tests/RunCMake/get_property/directory_properties.cmake
--- old/cmake-3.1.0/Tests/RunCMake/get_property/directory_properties.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/directory_properties.cmake
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,15 @@
+function (check_directory_property dir prop)
+ get_directory_property(gdp_val DIRECTORY "${dir}" "${prop}")
+ get_property(gp_val
+ DIRECTORY "${dir}"
+ PROPERTY "${prop}")
+
+ message("get_directory_property: -->${gdp_val}<--")
+ message("get_property: -->${gp_val}<--")
+endfunction ()
+
+set_directory_properties(PROPERTIES empty "" custom value)
+
+check_directory_property("${CMAKE_CURRENT_SOURCE_DIR}" empty)
+check_directory_property("${CMAKE_CURRENT_SOURCE_DIR}" custom)
+check_directory_property("${CMAKE_CURRENT_SOURCE_DIR}" noexist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/global_properties-stderr.txt
new/cmake-3.1.1/Tests/RunCMake/get_property/global_properties-stderr.txt
--- old/cmake-3.1.0/Tests/RunCMake/get_property/global_properties-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/global_properties-stderr.txt
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,6 @@
+^get_cmake_property: --><--
+get_property: --><--
+get_cmake_property: -->value<--
+get_property: -->value<--
+get_cmake_property: -->NOTFOUND<--
+get_property: --><--$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/global_properties.cmake
new/cmake-3.1.1/Tests/RunCMake/get_property/global_properties.cmake
--- old/cmake-3.1.0/Tests/RunCMake/get_property/global_properties.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/global_properties.cmake
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,16 @@
+function (check_global_property prop)
+ get_cmake_property(gcp_val "${prop}")
+ get_property(gp_val
+ GLOBAL
+ PROPERTY "${prop}")
+
+ message("get_cmake_property: -->${gcp_val}<--")
+ message("get_property: -->${gp_val}<--")
+endfunction ()
+
+set_property(GLOBAL PROPERTY empty "")
+set_property(GLOBAL PROPERTY custom value)
+
+check_global_property(empty)
+check_global_property(custom)
+check_global_property(noexist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/install_properties-stderr.txt
new/cmake-3.1.1/Tests/RunCMake/get_property/install_properties-stderr.txt
--- old/cmake-3.1.0/Tests/RunCMake/get_property/install_properties-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/install_properties-stderr.txt
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,3 @@
+^get_property: --><--
+get_property: -->value<--
+get_property: --><--$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/install_properties.cmake
new/cmake-3.1.1/Tests/RunCMake/get_property/install_properties.cmake
--- old/cmake-3.1.0/Tests/RunCMake/get_property/install_properties.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/install_properties.cmake
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,18 @@
+function (check_install_property file prop)
+ get_property(gp_val
+ INSTALL "${file}"
+ PROPERTY "${prop}")
+
+ message("get_property: -->${gp_val}<--")
+endfunction ()
+
+install(
+ FILES "${CMAKE_CURRENT_LIST_FILE}"
+ DESTINATION "${CMAKE_CURRENT_LIST_DIR}"
+ RENAME "installed-file-dest")
+set_property(INSTALL "${CMAKE_CURRENT_LIST_FILE}" PROPERTY empty "")
+set_property(INSTALL "${CMAKE_CURRENT_LIST_FILE}" PROPERTY custom value)
+
+check_install_property("${CMAKE_CURRENT_LIST_FILE}" empty)
+check_install_property("${CMAKE_CURRENT_LIST_FILE}" custom)
+check_install_property("${CMAKE_CURRENT_LIST_FILE}" noexist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/source_properties-stderr.txt
new/cmake-3.1.1/Tests/RunCMake/get_property/source_properties-stderr.txt
--- old/cmake-3.1.0/Tests/RunCMake/get_property/source_properties-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/source_properties-stderr.txt
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,6 @@
+^get_source_file_property: --><--
+get_property: --><--
+get_source_file_property: -->value<--
+get_property: -->value<--
+get_source_file_property: -->NOTFOUND<--
+get_property: --><--$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/source_properties.cmake
new/cmake-3.1.1/Tests/RunCMake/get_property/source_properties.cmake
--- old/cmake-3.1.0/Tests/RunCMake/get_property/source_properties.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/source_properties.cmake
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,15 @@
+function (check_source_file_property file prop)
+ get_source_file_property(gsfp_val "${file}" "${prop}")
+ get_property(gp_val
+ SOURCE "${file}"
+ PROPERTY "${prop}")
+
+ message("get_source_file_property: -->${gsfp_val}<--")
+ message("get_property: -->${gp_val}<--")
+endfunction ()
+
+set_source_files_properties(file.c PROPERTIES empty "" custom value)
+
+check_source_file_property(file.c empty)
+check_source_file_property(file.c custom)
+check_source_file_property(file.c noexist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/target_properties-stderr.txt
new/cmake-3.1.1/Tests/RunCMake/get_property/target_properties-stderr.txt
--- old/cmake-3.1.0/Tests/RunCMake/get_property/target_properties-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/target_properties-stderr.txt
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,6 @@
+^get_target_property: --><--
+get_property: --><--
+get_target_property: -->value<--
+get_property: -->value<--
+get_target_property: -->gtp_val-NOTFOUND<--
+get_property: --><--$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/target_properties.cmake
new/cmake-3.1.1/Tests/RunCMake/get_property/target_properties.cmake
--- old/cmake-3.1.0/Tests/RunCMake/get_property/target_properties.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/target_properties.cmake
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,16 @@
+function (check_target_property target prop)
+ get_target_property(gtp_val "${target}" "${prop}")
+ get_property(gp_val
+ TARGET "${target}"
+ PROPERTY "${prop}")
+
+ message("get_target_property: -->${gtp_val}<--")
+ message("get_property: -->${gp_val}<--")
+endfunction ()
+
+add_custom_target(tgt)
+set_target_properties(tgt PROPERTIES empty "" custom value)
+
+check_target_property(tgt empty)
+check_target_property(tgt custom)
+check_target_property(tgt noexist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/test_properties-stderr.txt
new/cmake-3.1.1/Tests/RunCMake/get_property/test_properties-stderr.txt
--- old/cmake-3.1.0/Tests/RunCMake/get_property/test_properties-stderr.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/test_properties-stderr.txt
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,6 @@
+^get_test_property: --><--
+get_property: --><--
+get_test_property: -->value<--
+get_property: -->value<--
+get_test_property: -->NOTFOUND<--
+get_property: --><--$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.1.0/Tests/RunCMake/get_property/test_properties.cmake
new/cmake-3.1.1/Tests/RunCMake/get_property/test_properties.cmake
--- old/cmake-3.1.0/Tests/RunCMake/get_property/test_properties.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.1/Tests/RunCMake/get_property/test_properties.cmake
2015-01-21 15:10:28.000000000 +0100
@@ -0,0 +1,17 @@
+function (check_test_property test prop)
+ get_test_property("${test}" "${prop}" gtp_val)
+ get_property(gp_val
+ TEST "${test}"
+ PROPERTY "${prop}")
+
+ message("get_test_property: -->${gtp_val}<--")
+ message("get_property: -->${gp_val}<--")
+endfunction ()
+
+include(CTest)
+add_test(NAME test COMMAND "${CMAKE_COMMAND}" --help)
+set_tests_properties(test PROPERTIES empty "" custom value)
+
+check_test_property(test empty)
+check_test_property(test custom)
+check_test_property(test noexist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.0/bootstrap new/cmake-3.1.1/bootstrap
--- old/cmake-3.1.0/bootstrap 2014-12-15 21:07:45.000000000 +0100
+++ new/cmake-3.1.1/bootstrap 2015-01-21 15:10:28.000000000 +0100
@@ -145,7 +145,7 @@
cmake_machine_parisc=true
fi
elif ${cmake_system_hpux}; then
- if !(uname -m | grep ia64 >/dev/null 2>&1); then
+ if uname -m | grep ia64 >/dev/null 2>&1; then : ; else
cmake_machine_parisc=true
fi
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
