Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-03-23 22:28:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09 18:18:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-03-23 22:29:00.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Mar 20 01:42:01 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.0.0~rc2
+ * Miscellaneous fixes since rc1
+ * FindRuby module learned to search for Ruby 2.0 and 2.1
+
+-------------------------------------------------------------------
cmake.changes: same change
Old:
----
cmake-3.0.0-rc1.tar.gz
New:
----
cmake-3.0.0-rc2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake-gui.spec ++++++
--- /var/tmp/diff_new_pack.DXkX8P/_old 2014-03-23 22:29:01.000000000 +0100
+++ /var/tmp/diff_new_pack.DXkX8P/_new 2014-03-23 22:29:01.000000000 +0100
@@ -17,9 +17,9 @@
Name: cmake-gui
-Version: 3.0.0~rc1
+Version: 3.0.0~rc2
Release: 0
-%define rversion 3.0.0-rc1
+%define rversion 3.0.0-rc2
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.DXkX8P/_old 2014-03-23 22:29:01.000000000 +0100
+++ /var/tmp/diff_new_pack.DXkX8P/_new 2014-03-23 22:29:01.000000000 +0100
@@ -17,9 +17,9 @@
Name: cmake
-Version: 3.0.0~rc1
+Version: 3.0.0~rc2
Release: 0
-%define rversion 3.0.0-rc1
+%define rversion 3.0.0-rc2
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz
Source1: cmake.macros
++++++ cmake-3.0.0-rc1.tar.gz -> cmake-3.0.0-rc2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Help/command/add_definitions.rst new/cmake-3.0.0-rc2/Help/command/add_definitions.rst
--- old/cmake-3.0.0-rc1/Help/command/add_definitions.rst 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Help/command/add_definitions.rst 2014-03-17 19:18:28.000000000 +0100
@@ -21,7 +21,5 @@
properties for details on adding preprocessor definitions to specific
scopes and configurations.
-Arguments to ``add_definitions`` may use "generator expressions" with
-the syntax "$<...>". See the :manual:`cmake-generator-expressions(7)`
-manual for available expressions. See the :manual:`cmake-buildsystem(7)`
-manual for more on defining buildsystem properties.
+See the :manual:`cmake-buildsystem(7)` manual for more on defining
+buildsystem properties.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Help/command/find_package.rst new/cmake-3.0.0-rc2/Help/command/find_package.rst
--- old/cmake-3.0.0-rc1/Help/command/find_package.rst 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Help/command/find_package.rst 2014-03-17 19:18:28.000000000 +0100
@@ -269,6 +269,7 @@
This can be skipped if ``NO_CMAKE_BUILDS_PATH`` is passed. It is intended
for the case when a user is building multiple dependent projects one
after another.
+ (This step is implemented only on Windows.)
6. Search paths stored in the CMake :ref:`User Package Registry`.
This can be skipped if ``NO_CMAKE_PACKAGE_REGISTRY`` is passed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Help/manual/cmake-variables.7.rst new/cmake-3.0.0-rc2/Help/manual/cmake-variables.7.rst
--- old/cmake-3.0.0-rc1/Help/manual/cmake-variables.7.rst 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Help/manual/cmake-variables.7.rst 2014-03-17 19:18:28.000000000 +0100
@@ -99,6 +99,7 @@
/variable/BUILD_SHARED_LIBS
/variable/CMAKE_ABSOLUTE_DESTINATION_FILES
+ /variable/CMAKE_APPBUNDLE_PATH
/variable/CMAKE_AUTOMOC_RELAXED_MODE
/variable/CMAKE_BACKWARDS_COMPATIBILITY
/variable/CMAKE_BUILD_TYPE
@@ -118,6 +119,7 @@
/variable/CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
/variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
+ /variable/CMAKE_FRAMEWORK_PATH
/variable/CMAKE_IGNORE_PATH
/variable/CMAKE_INCLUDE_PATH
/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Help/policy/CMP0026.rst new/cmake-3.0.0-rc2/Help/policy/CMP0026.rst
--- old/cmake-3.0.0-rc1/Help/policy/CMP0026.rst 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Help/policy/CMP0026.rst 2014-03-17 19:18:29.000000000 +0100
@@ -3,7 +3,8 @@
Disallow use of the LOCATION target property.
-CMake 2.8.12 and lower allowed reading the LOCATION target property to
+CMake 2.8.12 and lower allowed reading the LOCATION target
+property (and configuration-specific variants) to
determine the eventual location of build targets. This relies on the
assumption that all necessary information is available at
configure-time to determine the final location and filename of the
@@ -17,8 +18,8 @@
subcommand to generate a file containing the target location.
The OLD behavior for this policy is to allow reading the LOCATION
-property from build-targets. The NEW behavior for this policy is to
-not to allow reading the LOCATION property from build-targets.
+properties from build-targets. The NEW behavior for this policy is to
+not to allow reading the LOCATION properties from build-targets.
This policy was introduced in CMake version 3.0. CMake version
|release| warns when the policy is not set and uses OLD behavior. Use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Help/policy/CMP0043.rst new/cmake-3.0.0-rc2/Help/policy/CMP0043.rst
--- old/cmake-3.0.0-rc1/Help/policy/CMP0043.rst 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Help/policy/CMP0043.rst 2014-03-17 19:18:29.000000000 +0100
@@ -18,16 +18,22 @@
.. code-block:: cmake
- # Old Interface:
+ # Old Interfaces:
set_property(TARGET tgt APPEND PROPERTY
COMPILE_DEFINITIONS_DEBUG DEBUG_MODE
)
+ set_property(DIRECTORY APPEND PROPERTY
+ COMPILE_DEFINITIONS_DEBUG DIR_DEBUG_MODE
+ )
# New Interfaces:
set_property(TARGET tgt APPEND PROPERTY
COMPILE_DEFINITIONS $<$CONFIG:Debug:DEBUG_MODE>
)
target_compile_definitions(tgt PRIVATE $<$CONFIG:Debug:DEBUG_MODE>)
+ set_property(DIRECTORY APPEND PROPERTY
+ COMPILE_DEFINITIONS $<$CONFIG:Debug:DIR_DEBUG_MODE>
+ )
The OLD behavior for this policy is to consume the content of the suffixed
:prop_tgt:`COMPILE_DEFINITIONS_<CONFIG>` target property when generating the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Help/release/3.0.0.rst new/cmake-3.0.0-rc2/Help/release/3.0.0.rst
--- old/cmake-3.0.0-rc1/Help/release/3.0.0.rst 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Help/release/3.0.0.rst 2014-03-17 19:18:29.000000000 +0100
@@ -245,6 +245,8 @@
for Qt executables. This helps disambiguate when using multiple
:manual:`Qt versions ` in the same buildsystem.
+* The :module:`FindRuby` module learned to search for Ruby 2.0 and 2.1.
+
Generator Expressions
---------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Help/variable/CMAKE_APPBUNDLE_PATH.rst new/cmake-3.0.0-rc2/Help/variable/CMAKE_APPBUNDLE_PATH.rst
--- old/cmake-3.0.0-rc1/Help/variable/CMAKE_APPBUNDLE_PATH.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Help/variable/CMAKE_APPBUNDLE_PATH.rst 2014-03-17 19:18:29.000000000 +0100
@@ -0,0 +1,5 @@
+CMAKE_APPBUNDLE_PATH
+--------------------
+
+Search path for OS X application bundles used by the :command:`find_program`,
+and :command:`find_package` commands.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Help/variable/CMAKE_FRAMEWORK_PATH.rst new/cmake-3.0.0-rc2/Help/variable/CMAKE_FRAMEWORK_PATH.rst
--- old/cmake-3.0.0-rc1/Help/variable/CMAKE_FRAMEWORK_PATH.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Help/variable/CMAKE_FRAMEWORK_PATH.rst 2014-03-17 19:18:29.000000000 +0100
@@ -0,0 +1,6 @@
+CMAKE_FRAMEWORK_PATH
+--------------------
+
+Search path for OS X frameworks used by the :command:`find_library`,
+:command:`find_package`, :command:`find_path`, and :command:`find_file`
+commands.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/CMakeCCompilerId.c.in new/cmake-3.0.0-rc2/Modules/CMakeCCompilerId.c.in
--- old/cmake-3.0.0-rc1/Modules/CMakeCCompilerId.c.in 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/CMakeCCompilerId.c.in 2014-03-17 19:18:29.000000000 +0100
@@ -14,7 +14,11 @@
/* __INTEL_COMPILER = VRP */
# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100)
# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10)
-# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
+# if defined(__INTEL_COMPILER_UPDATE)
+# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE)
+# else
+# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
+# endif
# if defined(__INTEL_COMPILER_BUILD_DATE)
/* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */
# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/CMakeCXXCompilerId.cpp.in new/cmake-3.0.0-rc2/Modules/CMakeCXXCompilerId.cpp.in
--- old/cmake-3.0.0-rc1/Modules/CMakeCXXCompilerId.cpp.in 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/CMakeCXXCompilerId.cpp.in 2014-03-17 19:18:29.000000000 +0100
@@ -19,7 +19,11 @@
/* __INTEL_COMPILER = VRP */
# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100)
# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10)
-# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
+# if defined(__INTEL_COMPILER_UPDATE)
+# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE)
+# else
+# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
+# endif
# if defined(__INTEL_COMPILER_BUILD_DATE)
/* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */
# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/CMakeDetermineASMCompiler.cmake new/cmake-3.0.0-rc2/Modules/CMakeDetermineASMCompiler.cmake
--- old/cmake-3.0.0-rc1/Modules/CMakeDetermineASMCompiler.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/CMakeDetermineASMCompiler.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -48,22 +48,7 @@
_cmake_find_compiler(ASM${ASM_DIALECT})
else()
-
- # we only get here if CMAKE_ASM${ASM_DIALECT}_COMPILER was specified using -D or a pre-made CMakeCache.txt
- # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
- #
- # if a compiler was specified by the user but without path,
- # now try to find it with the full path
- # if it is found, force it into the cache,
- # if not, don't overwrite the setting (which was given by the user) with "NOTFOUND"
- get_filename_component(_CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" PATH)
- if(NOT _CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH)
- find_program(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER})
- if(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH)
- set(CMAKE_ASM${ASM_DIALECT}_COMPILER ${CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH} CACHE FILEPATH "Assembler" FORCE)
- endif()
- unset(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH CACHE)
- endif()
+ _cmake_find_compiler_path(ASM${ASM_DIALECT})
endif()
mark_as_advanced(CMAKE_ASM${ASM_DIALECT}_COMPILER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/CMakeDetermineCCompiler.cmake new/cmake-3.0.0-rc2/Modules/CMakeDetermineCCompiler.cmake
--- old/cmake-3.0.0-rc1/Modules/CMakeDetermineCCompiler.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/CMakeDetermineCCompiler.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -42,6 +42,7 @@
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
elseif("${CMAKE_GENERATOR}" MATCHES "Xcode")
set(CMAKE_C_COMPILER_XCODE_TYPE sourcecode.c.c)
+ _cmake_find_compiler_path(C)
else()
if(NOT CMAKE_C_COMPILER)
set(CMAKE_C_COMPILER_INIT NOTFOUND)
@@ -72,31 +73,7 @@
_cmake_find_compiler(C)
else()
-
- # we only get here if CMAKE_C_COMPILER was specified using -D or a pre-made CMakeCache.txt
- # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
- # if CMAKE_C_COMPILER is a list of length 2, use the first item as
- # CMAKE_C_COMPILER and the 2nd one as CMAKE_C_COMPILER_ARG1
-
- list(LENGTH CMAKE_C_COMPILER _CMAKE_C_COMPILER_LIST_LENGTH)
- if("${_CMAKE_C_COMPILER_LIST_LENGTH}" EQUAL 2)
- list(GET CMAKE_C_COMPILER 1 CMAKE_C_COMPILER_ARG1)
- list(GET CMAKE_C_COMPILER 0 CMAKE_C_COMPILER)
- endif()
-
- # if a compiler was specified by the user but without path,
- # now try to find it with the full path
- # if it is found, force it into the cache,
- # if not, don't overwrite the setting (which was given by the user) with "NOTFOUND"
- # if the C compiler already had a path, reuse it for searching the CXX compiler
- get_filename_component(_CMAKE_USER_C_COMPILER_PATH "${CMAKE_C_COMPILER}" PATH)
- if(NOT _CMAKE_USER_C_COMPILER_PATH)
- find_program(CMAKE_C_COMPILER_WITH_PATH NAMES ${CMAKE_C_COMPILER})
- if(CMAKE_C_COMPILER_WITH_PATH)
- set(CMAKE_C_COMPILER ${CMAKE_C_COMPILER_WITH_PATH} CACHE STRING "C compiler" FORCE)
- endif()
- unset(CMAKE_C_COMPILER_WITH_PATH CACHE)
- endif()
+ _cmake_find_compiler_path(C)
endif()
mark_as_advanced(CMAKE_C_COMPILER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/CMakeDetermineCXXCompiler.cmake new/cmake-3.0.0-rc2/Modules/CMakeDetermineCXXCompiler.cmake
--- old/cmake-3.0.0-rc1/Modules/CMakeDetermineCXXCompiler.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/CMakeDetermineCXXCompiler.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -41,6 +41,7 @@
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
elseif("${CMAKE_GENERATOR}" MATCHES "Xcode")
set(CMAKE_CXX_COMPILER_XCODE_TYPE sourcecode.cpp.cpp)
+ _cmake_find_compiler_path(CXX)
else()
if(NOT CMAKE_CXX_COMPILER)
set(CMAKE_CXX_COMPILER_INIT NOTFOUND)
@@ -70,32 +71,7 @@
_cmake_find_compiler(CXX)
else()
-
- # we only get here if CMAKE_CXX_COMPILER was specified using -D or a pre-made CMakeCache.txt
- # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
- #
- # if CMAKE_CXX_COMPILER is a list of length 2, use the first item as
- # CMAKE_CXX_COMPILER and the 2nd one as CMAKE_CXX_COMPILER_ARG1
-
- list(LENGTH CMAKE_CXX_COMPILER _CMAKE_CXX_COMPILER_LIST_LENGTH)
- if("${_CMAKE_CXX_COMPILER_LIST_LENGTH}" EQUAL 2)
- list(GET CMAKE_CXX_COMPILER 1 CMAKE_CXX_COMPILER_ARG1)
- list(GET CMAKE_CXX_COMPILER 0 CMAKE_CXX_COMPILER)
- endif()
-
- # if a compiler was specified by the user but without path,
- # now try to find it with the full path
- # if it is found, force it into the cache,
- # if not, don't overwrite the setting (which was given by the user) with "NOTFOUND"
- # if the CXX compiler already had a path, reuse it for searching the C compiler
- get_filename_component(_CMAKE_USER_CXX_COMPILER_PATH "${CMAKE_CXX_COMPILER}" PATH)
- if(NOT _CMAKE_USER_CXX_COMPILER_PATH)
- find_program(CMAKE_CXX_COMPILER_WITH_PATH NAMES ${CMAKE_CXX_COMPILER})
- if(CMAKE_CXX_COMPILER_WITH_PATH)
- set(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER_WITH_PATH} CACHE STRING "CXX compiler" FORCE)
- endif()
- unset(CMAKE_CXX_COMPILER_WITH_PATH CACHE)
- endif()
+ _cmake_find_compiler_path(CXX)
endif()
mark_as_advanced(CMAKE_CXX_COMPILER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/CMakeDetermineCompiler.cmake new/cmake-3.0.0-rc2/Modules/CMakeDetermineCompiler.cmake
--- old/cmake-3.0.0-rc1/Modules/CMakeDetermineCompiler.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/CMakeDetermineCompiler.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -83,3 +83,33 @@
endforeach()
endif()
endmacro()
+
+macro(_cmake_find_compiler_path lang)
+ if(CMAKE_${lang}_COMPILER)
+ # we only get here if CMAKE_${lang}_COMPILER was specified using -D or a pre-made CMakeCache.txt
+ # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
+ # if CMAKE_${lang}_COMPILER is a list of length 2, use the first item as
+ # CMAKE_${lang}_COMPILER and the 2nd one as CMAKE_${lang}_COMPILER_ARG1
+ list(LENGTH CMAKE_${lang}_COMPILER _CMAKE_${lang}_COMPILER_LIST_LENGTH)
+ if("${_CMAKE_${lang}_COMPILER_LIST_LENGTH}" EQUAL 2)
+ list(GET CMAKE_${lang}_COMPILER 1 CMAKE_${lang}_COMPILER_ARG1)
+ list(GET CMAKE_${lang}_COMPILER 0 CMAKE_${lang}_COMPILER)
+ endif()
+ unset(_CMAKE_${lang}_COMPILER_LIST_LENGTH)
+
+ # find the compiler in the PATH if necessary
+ get_filename_component(_CMAKE_USER_${lang}_COMPILER_PATH "${CMAKE_${lang}_COMPILER}" PATH)
+ if(NOT _CMAKE_USER_${lang}_COMPILER_PATH)
+ find_program(CMAKE_${lang}_COMPILER_WITH_PATH NAMES ${CMAKE_${lang}_COMPILER})
+ if(CMAKE_${lang}_COMPILER_WITH_PATH)
+ set(CMAKE_${lang}_COMPILER ${CMAKE_${lang}_COMPILER_WITH_PATH})
+ get_property(_CMAKE_${lang}_COMPILER_CACHED CACHE CMAKE_${lang}_COMPILER PROPERTY TYPE)
+ if(_CMAKE_${lang}_COMPILER_CACHED)
+ set(CMAKE_${lang}_COMPILER "${CMAKE_${lang}_COMPILER}" CACHE STRING "${lang} compiler" FORCE)
+ endif()
+ unset(_CMAKE_${lang}_COMPILER_CACHED)
+ endif()
+ unset(CMAKE_${lang}_COMPILER_WITH_PATH CACHE)
+ endif()
+ endif()
+endmacro()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/CMakeDetermineFortranCompiler.cmake new/cmake-3.0.0-rc2/Modules/CMakeDetermineFortranCompiler.cmake
--- old/cmake-3.0.0-rc1/Modules/CMakeDetermineFortranCompiler.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/CMakeDetermineFortranCompiler.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -28,6 +28,7 @@
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
elseif("${CMAKE_GENERATOR}" MATCHES "Xcode")
set(CMAKE_Fortran_COMPILER_XCODE_TYPE sourcecode.fortran.f90)
+ _cmake_find_compiler_path(Fortran)
else()
if(NOT CMAKE_Fortran_COMPILER)
# prefer the environment variable CC
@@ -90,31 +91,7 @@
_cmake_find_compiler(Fortran)
else()
- # we only get here if CMAKE_Fortran_COMPILER was specified using -D or a pre-made CMakeCache.txt
- # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
- # if CMAKE_Fortran_COMPILER is a list of length 2, use the first item as
- # CMAKE_Fortran_COMPILER and the 2nd one as CMAKE_Fortran_COMPILER_ARG1
-
- list(LENGTH CMAKE_Fortran_COMPILER _CMAKE_Fortran_COMPILER_LIST_LENGTH)
- if("${_CMAKE_Fortran_COMPILER_LIST_LENGTH}" EQUAL 2)
- list(GET CMAKE_Fortran_COMPILER 1 CMAKE_Fortran_COMPILER_ARG1)
- list(GET CMAKE_Fortran_COMPILER 0 CMAKE_Fortran_COMPILER)
- endif()
-
- # if a compiler was specified by the user but without path,
- # now try to find it with the full path
- # if it is found, force it into the cache,
- # if not, don't overwrite the setting (which was given by the user) with "NOTFOUND"
- # if the C compiler already had a path, reuse it for searching the CXX compiler
- get_filename_component(_CMAKE_USER_Fortran_COMPILER_PATH "${CMAKE_Fortran_COMPILER}" PATH)
- if(NOT _CMAKE_USER_Fortran_COMPILER_PATH)
- find_program(CMAKE_Fortran_COMPILER_WITH_PATH NAMES ${CMAKE_Fortran_COMPILER})
- if(CMAKE_Fortran_COMPILER_WITH_PATH)
- set(CMAKE_Fortran_COMPILER ${CMAKE_Fortran_COMPILER_WITH_PATH}
- CACHE STRING "Fortran compiler" FORCE)
- endif()
- unset(CMAKE_Fortran_COMPILER_WITH_PATH CACHE)
- endif()
+ _cmake_find_compiler_path(Fortran)
endif()
mark_as_advanced(CMAKE_Fortran_COMPILER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/CMakeFindDependencyMacro.cmake new/cmake-3.0.0-rc2/Modules/CMakeFindDependencyMacro.cmake
--- old/cmake-3.0.0-rc1/Modules/CMakeFindDependencyMacro.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/CMakeFindDependencyMacro.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -4,7 +4,7 @@
#
# ::
#
-# find_dependency(<dep> [<version>])
+# find_dependency(<dep> [<version> [EXACT]])
#
#
# ``find_dependency()`` wraps a :command:`find_package` call for a package
@@ -31,12 +31,24 @@
if (NOT ${dep}_FOUND)
set(cmake_fd_version)
if (${ARGC} GREATER 1)
+ if ("${ARGV1}" STREQUAL "")
+ message(FATAL_ERROR "Invalid arguments to find_dependency. VERSION is empty")
+ endif()
+ if ("${ARGV1}" STREQUAL EXACT)
+ message(FATAL_ERROR "Invalid arguments to find_dependency. EXACT may only be specified if a VERSION is specified")
+ endif()
set(cmake_fd_version ${ARGV1})
endif()
set(cmake_fd_exact_arg)
- if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT)
+ if(${ARGC} GREATER 2)
+ if (NOT "${ARGV2}" STREQUAL EXACT)
+ message(FATAL_ERROR "Invalid arguments to find_dependency")
+ endif()
set(cmake_fd_exact_arg EXACT)
endif()
+ if(${ARGC} GREATER 3)
+ message(FATAL_ERROR "Invalid arguments to find_dependency")
+ endif()
set(cmake_fd_quiet_arg)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
set(cmake_fd_quiet_arg QUIET)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/FindPythonInterp.cmake new/cmake-3.0.0-rc2/Modules/FindPythonInterp.cmake
--- old/cmake-3.0.0-rc1/Modules/FindPythonInterp.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/FindPythonInterp.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -47,7 +47,7 @@
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
if(PythonInterp_FIND_VERSION)
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/FindPythonLibs.cmake new/cmake-3.0.0-rc2/Modules/FindPythonLibs.cmake
--- old/cmake-3.0.0-rc1/Modules/FindPythonLibs.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/FindPythonLibs.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -51,7 +51,7 @@
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
if(PythonLibs_FIND_VERSION)
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/FindRuby.cmake new/cmake-3.0.0-rc2/Modules/FindRuby.cmake
--- old/cmake-3.0.0-rc1/Modules/FindRuby.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/FindRuby.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -5,7 +5,8 @@
# Find Ruby
#
# This module finds if Ruby is installed and determines where the
-# include files and libraries are. Ruby 1.8 and 1.9 are supported.
+# include files and libraries are. Ruby 1.8, 1.9, 2.0 and 2.1 are
+# supported.
#
# The minimum required version of Ruby can be specified using the
# standard syntax, e.g. find_package(Ruby 1.8)
@@ -67,6 +68,8 @@
endif()
if(NOT Ruby_FIND_VERSION_EXACT)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
# if we want a version below 1.9, also look for ruby 1.8
@@ -79,7 +82,6 @@
find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-
if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
function(_RUBY_CONFIG_VAR RBVAR OUTVAR)
execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']"
@@ -105,6 +107,7 @@
_RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR)
_RUBY_CONFIG_VAR("arch" RUBY_ARCH)
_RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR)
+ _RUBY_CONFIG_VAR("rubyarchhdrdir" RUBY_ARCHHDR_DIR)
_RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
_RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
@@ -126,7 +129,8 @@
set(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE)
set(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE)
set(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE)
- set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9)" FORCE)
+ set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9+)" FORCE)
+ set(RUBY_ARCHHDR_DIR ${RUBY_ARCHHDR_DIR} CACHE PATH "The Ruby arch header dir (2.0+)" FORCE)
set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
set(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE)
set(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE)
@@ -139,6 +143,7 @@
RUBY_ARCH_DIR
RUBY_ARCH
RUBY_HDR_DIR
+ RUBY_ARCHHDR_DIR
RUBY_POSSIBLE_LIB_DIR
RUBY_RUBY_LIB_DIR
RUBY_SITEARCH_DIR
@@ -160,10 +165,20 @@
set(RUBY_VERSION_MINOR 8)
set(RUBY_VERSION_PATCH 0)
# check whether we found 1.9.x
- if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR)
+ if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
set(RUBY_VERSION_MAJOR 1)
set(RUBY_VERSION_MINOR 9)
endif()
+ # check whether we found 2.0.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?0")
+ set(RUBY_VERSION_MAJOR 2)
+ set(RUBY_VERSION_MINOR 0)
+ endif()
+ # check whether we found 2.1.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?1")
+ set(RUBY_VERSION_MAJOR 2)
+ set(RUBY_VERSION_MINOR 1)
+ endif()
endif()
if(RUBY_VERSION_MAJOR)
@@ -189,6 +204,7 @@
HINTS
${RUBY_HDR_DIR}/${RUBY_ARCH}
${RUBY_ARCH_DIR}
+ ${RUBY_ARCHHDR_DIR}
)
set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Modules/Qt4Macros.cmake new/cmake-3.0.0-rc2/Modules/Qt4Macros.cmake
--- old/cmake-3.0.0-rc1/Modules/Qt4Macros.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Modules/Qt4Macros.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -342,7 +342,7 @@
if(_optionalClassName)
add_custom_command(OUTPUT "${_impl}" "${_header}"
- COMMAND Qt4::qdbuscpp2xml -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
+ COMMAND Qt4::qdbusxml2cpp -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
DEPENDS ${_infile} VERBATIM
)
else()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Source/CMakeVersion.cmake new/cmake-3.0.0-rc2/Source/CMakeVersion.cmake
--- old/cmake-3.0.0-rc1/Source/CMakeVersion.cmake 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Source/CMakeVersion.cmake 2014-03-17 19:18:29.000000000 +0100
@@ -2,4 +2,4 @@
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 0)
set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_RC 2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Source/QtDialog/CMakeLists.txt new/cmake-3.0.0-rc2/Source/QtDialog/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Source/QtDialog/CMakeLists.txt 2014-02-26 16:41:21.000000000 +0100
+++ new/cmake-3.0.0-rc2/Source/QtDialog/CMakeLists.txt 2014-03-17 19:18:29.000000000 +0100
@@ -27,7 +27,9 @@
macro(qt4_add_resources)
qt5_add_resources(${ARGN})
endmacro()
- set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+ set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+ set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+
# Remove this when the minimum version of Qt is 4.6.
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
@@ -47,6 +49,8 @@
include(${QT_USE_FILE})
+ set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
+
if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
if(EXISTS "${_Qt_BIN_DIR}/QtCore4.dll")
@@ -112,7 +116,7 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
+target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(Qt_BIN_DIR)
set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Source/cmComputeTargetDepends.cxx new/cmake-3.0.0-rc2/Source/cmComputeTargetDepends.cxx
--- old/cmake-3.0.0-rc1/Source/cmComputeTargetDepends.cxx 2014-02-26 16:41:22.000000000 +0100
+++ new/cmake-3.0.0-rc2/Source/cmComputeTargetDepends.cxx 2014-03-17 19:18:29.000000000 +0100
@@ -349,7 +349,7 @@
cmMakefile *makefile = depender->GetMakefile();
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
bool issueMessage = false;
- switch(makefile->GetPolicyStatus(cmPolicies::CMP0046))
+ switch(depender->GetPolicyStatusCMP0046())
{
case cmPolicies::WARN:
issueMessage = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Source/cmQtAutoGenerators.cxx new/cmake-3.0.0-rc2/Source/cmQtAutoGenerators.cxx
--- old/cmake-3.0.0-rc1/Source/cmQtAutoGenerators.cxx 2014-02-26 16:41:22.000000000 +0100
+++ new/cmake-3.0.0-rc2/Source/cmQtAutoGenerators.cxx 2014-03-17 19:18:29.000000000 +0100
@@ -260,6 +260,18 @@
// This also works around a VS 11 bug that may skip updating the target:
// https://connect.microsoft.com/VisualStudio/feedback/details/769495
usePRE_BUILD = vslg->GetVersion() >= cmLocalVisualStudioGenerator::VS7;
+ if(usePRE_BUILD)
+ {
+ for (std::vectorstd::string::iterator it = depends.begin();
+ it != depends.end(); ++it)
+ {
+ if(!makefile->FindTargetToUse(it->c_str()))
+ {
+ usePRE_BUILD = false;
+ break;
+ }
+ }
+ }
}
if(usePRE_BUILD)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Source/cmTarget.cxx new/cmake-3.0.0-rc2/Source/cmTarget.cxx
--- old/cmake-3.0.0-rc1/Source/cmTarget.cxx 2014-02-26 16:41:22.000000000 +0100
+++ new/cmake-3.0.0-rc2/Source/cmTarget.cxx 2014-03-17 19:18:29.000000000 +0100
@@ -403,11 +403,10 @@
//----------------------------------------------------------------------------
void cmTarget::AddUtility(const char *u, cmMakefile *makefile)
{
- this->Utilities.insert(u);
- if(makefile)
- {
+ if(this->Utilities.insert(u).second && makefile)
+ {
makefile->GetBacktrace(UtilityBacktraces[u]);
- }
+ }
}
//----------------------------------------------------------------------------
@@ -1730,7 +1729,7 @@
cmake::MessageType messageType = cmake::FATAL_ERROR;
if (fromEvaluatedImported)
{
- switch(mf->GetPolicyStatus(cmPolicies::CMP0027))
+ switch(tgt->GetPolicyStatusCMP0027())
{
case cmPolicies::WARN:
e << (mf->GetPolicies()
@@ -2731,6 +2730,21 @@
this->GetLocation(configName.c_str()),
cmProperty::TARGET);
}
+ // Support "<CONFIG>_LOCATION".
+ if(cmHasLiteralSuffix(prop, "_LOCATION"))
+ {
+ std::string configName(prop, strlen(prop) - 9);
+ if(configName != "IMPORTED")
+ {
+ if (!this->HandleLocationPropertyPolicy())
+ {
+ return 0;
+ }
+ this->Properties.SetProperty(prop,
+ this->GetLocation(configName.c_str()),
+ cmProperty::TARGET);
+ }
+ }
}
if(strcmp(prop,"INCLUDE_DIRECTORIES") == 0)
{
@@ -5662,7 +5676,7 @@
bool noMessage = false;
cmake::MessageType messageType = cmake::FATAL_ERROR;
cmOStringStream e;
- switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0038))
+ switch(this->GetPolicyStatusCMP0038())
{
case cmPolicies::WARN:
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Source/cmTarget.h new/cmake-3.0.0-rc2/Source/cmTarget.h
--- old/cmake-3.0.0-rc1/Source/cmTarget.h 2014-02-26 16:41:22.000000000 +0100
+++ new/cmake-3.0.0-rc2/Source/cmTarget.h 2014-03-17 19:18:29.000000000 +0100
@@ -26,8 +26,11 @@
F(CMP0020) \
F(CMP0021) \
F(CMP0022) \
+ F(CMP0027) \
+ F(CMP0038) \
F(CMP0041) \
- F(CMP0042)
+ F(CMP0042) \
+ F(CMP0046)
class cmake;
class cmMakefile;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Source/cmake.cxx new/cmake-3.0.0-rc2/Source/cmake.cxx
--- old/cmake-3.0.0-rc1/Source/cmake.cxx 2014-02-26 16:41:22.000000000 +0100
+++ new/cmake-3.0.0-rc2/Source/cmake.cxx 2014-03-17 19:18:30.000000000 +0100
@@ -653,7 +653,7 @@
cmSystemTools::ConvertToUnixSlashes(path);
this->SetHomeOutputDirectory(path.c_str());
}
- else if((i < args.size()-1) && (arg.find("--check-build-system",0) == 0))
+ else if((i < args.size()-2) && (arg.find("--check-build-system",0) == 0))
{
this->CheckBuildSystemArgument = args[++i];
this->ClearBuildSystem = (atoi(args[++i].c_str()) > 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/QtAutogen/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/QtAutogen/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/QtAutogen/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/QtAutogen/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -58,11 +58,17 @@
COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_CURRENT_BINARY_DIR}/myinterface.h.in" "${CMAKE_CURRENT_BINARY_DIR}/myinterface.h"
)
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h"
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in" "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in"
+)
+
add_executable(QtAutogen main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
xyz.cpp yaf.cpp gadget.cpp $
test.qrc resourcetester.cpp generated.cpp
)
-set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS generate_moc_input)
+set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS generate_moc_input "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h")
set_target_properties(QtAutogen codeeditorLib privateSlot PROPERTIES AUTOMOC TRUE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/QtAutogen/generated.h new/cmake-3.0.0-rc2/Tests/QtAutogen/generated.h
--- old/cmake-3.0.0-rc1/Tests/QtAutogen/generated.h 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/QtAutogen/generated.h 2014-03-17 19:18:30.000000000 +0100
@@ -5,11 +5,12 @@
#include <QObject>
#include "myinterface.h"
+#include "myotherinterface.h"
-class Generated : public QObject, MyInterface
+class Generated : public QObject, MyInterface, MyOtherInterface
{
Q_OBJECT
- Q_INTERFACES(MyInterface)
+ Q_INTERFACES(MyInterface MyOtherInterface)
public:
explicit Generated(QObject *parent = 0);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/QtAutogen/myotherinterface.h.in new/cmake-3.0.0-rc2/Tests/QtAutogen/myotherinterface.h.in
--- old/cmake-3.0.0-rc1/Tests/QtAutogen/myotherinterface.h.in 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/QtAutogen/myotherinterface.h.in 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,14 @@
+
+#ifndef MYOTHERINTERFACE_H
+#define MYOTHERINTERFACE_H
+
+#include <QObject>
+
+class MyOtherInterface
+{
+
+};
+
+Q_DECLARE_INTERFACE(MyOtherInterface, "org.cmake.example.MyOtherInterface")
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-result.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-result.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-result.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-result.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,11 @@
+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 \$, as appropriate.
+
+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-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,7 @@
+
+enable_language(CXX)
+
+cmake_policy(SET CMP0026 NEW)
+
+add_library(somelib empty.cpp)
+get_target_property(_loc somelib Debug_LOCATION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-result.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-result.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-result.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-result.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+^$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,7 @@
+
+enable_language(CXX)
+
+cmake_policy(SET CMP0026 OLD)
+
+add_library(somelib empty.cpp)
+get_target_property(_loc somelib Debug_LOCATION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN-result.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN-result.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN-result.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN-result.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN-stderr.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN-stderr.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN-stderr.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN-stderr.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,12 @@
+CMake Warning \(dev\) at CMP0026-CONFIG-LOCATION-WARN.cmake:5 \(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 "somelib". Use the
+ target name directly with add_custom_command, or use the generator
+ expression \$, as appropriate.
+
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(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.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-WARN.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,5 @@
+
+enable_language(CXX)
+
+add_library(somelib empty.cpp)
+get_target_property(_loc somelib Debug_LOCATION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-result.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-result.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-result.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-result.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,11 @@
+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 \$, as appropriate.
+
+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-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,7 @@
+
+enable_language(CXX)
+
+cmake_policy(SET CMP0026 NEW)
+
+add_library(somelib empty.cpp)
+get_target_property(_loc somelib LOCATION_Debug)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-result.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-result.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-result.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-result.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+^$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,7 @@
+
+enable_language(CXX)
+
+cmake_policy(SET CMP0026 OLD)
+
+add_library(somelib empty.cpp)
+get_target_property(_loc somelib LOCATION_Debug)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN-result.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN-result.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN-result.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN-result.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN-stderr.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN-stderr.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN-stderr.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN-stderr.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,12 @@
+CMake Warning \(dev\) at CMP0026-LOCATION-CONFIG-WARN.cmake:5 \(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 "somelib". Use the
+ target name directly with add_custom_command, or use the generator
+ expression \$, as appropriate.
+
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(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.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-WARN.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,5 @@
+
+enable_language(CXX)
+
+add_library(somelib empty.cpp)
+get_target_property(_loc somelib LOCATION_Debug)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/RunCMakeTest.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/RunCMakeTest.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0026/RunCMakeTest.cmake 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/RunCMakeTest.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -3,3 +3,9 @@
run_cmake(CMP0026-WARN)
run_cmake(CMP0026-NEW)
run_cmake(CMP0026-IMPORTED)
+run_cmake(CMP0026-CONFIG-LOCATION-NEW)
+run_cmake(CMP0026-CONFIG-LOCATION-OLD)
+run_cmake(CMP0026-CONFIG-LOCATION-WARN)
+run_cmake(CMP0026-LOCATION-CONFIG-NEW)
+run_cmake(CMP0026-LOCATION-CONFIG-OLD)
+run_cmake(CMP0026-LOCATION-CONFIG-WARN)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0027/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0027/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0027/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0027/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0028/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0028/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0028/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0028/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) # policy used at end of dir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0037/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0037/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0038/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0038/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0038/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0038/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0039/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0039/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0039/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0039/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0040/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0040/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0040/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0040/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0041/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0041/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0041/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0041/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0042/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0042/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0042/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0042/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0043/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0043/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0043/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0043/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) # policy used at end of dir
if(CMAKE_BUILD_TYPE)
# Dummy variable use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0045/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0045/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0045/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0045/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/CMP0046-Duplicate-result.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-Duplicate-result.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/CMP0046-Duplicate-result.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-Duplicate-result.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1 @@
+0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/CMP0046-Duplicate-stderr.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-Duplicate-stderr.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/CMP0046-Duplicate-stderr.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-Duplicate-stderr.txt 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,10 @@
+CMake Warning \(dev\) at CMP0046-Duplicate.cmake:5 \(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 "ctgt_no_exist" of target "dummy" does not exist.
+Call Stack \(most recent call first\):
+ CMP0046-Duplicate.cmake:8 \(add_dep\)
+ CMakeLists.txt:3 \(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.0.0-rc1/Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,9 @@
+
+add_library(dummy empty.cpp)
+
+macro(add_dep)
+ add_dependencies(dummy ctgt_no_exist)
+endmacro()
+
+add_dep()
+add_dep()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/RunCMakeTest.cmake new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/RunCMakeTest.cmake
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/RunCMakeTest.cmake 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/RunCMakeTest.cmake 2014-03-17 19:18:30.000000000 +0100
@@ -6,3 +6,4 @@
run_cmake(CMP0046-OLD-existing-dependency)
run_cmake(CMP0046-NEW-existing-dependency)
+run_cmake(CMP0046-Duplicate)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/empty.cpp new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/empty.cpp
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0046/empty.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/empty.cpp 2014-03-17 19:18:30.000000000 +0100
@@ -0,0 +1,7 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int empty()
+{
+ return 0;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0049/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0049/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0049/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0049/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0050/CMakeLists.txt new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0050/CMakeLists.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/CMP0050/CMakeLists.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/CMP0050/CMakeLists.txt 2014-03-17 19:18:30.000000000 +0100
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc1/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt new/cmake-3.0.0-rc2/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
--- old/cmake-3.0.0-rc1/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt 2014-02-26 16:41:23.000000000 +0100
+++ new/cmake-3.0.0-rc2/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt 2014-03-17 19:18:31.000000000 +0100
@@ -11,8 +11,11 @@
\* CMP0020
\* CMP0021
\* CMP0022
+ \* CMP0027
+ \* CMP0038
\* CMP0041
\* CMP0042
+ \* CMP0046
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
++++++ cmake-fix-ruby-test.patch ++++++
--- /var/tmp/diff_new_pack.DXkX8P/_old 2014-03-23 22:29:03.000000000 +0100
+++ /var/tmp/diff_new_pack.DXkX8P/_new 2014-03-23 22:29:03.000000000 +0100
@@ -1,6 +1,6 @@
---- cmake-3.0.0-rc1.orig/Modules/FindRuby.cmake 2014-02-26 16:41:21.000000000 +0100
-+++ cmake-3.0.0-rc1/Modules/FindRuby.cmake 2014-03-01 02:17:02.602227025 +0100
-@@ -113,7 +113,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
+--- cmake-3.0.0-rc2.orig/Modules/FindRuby.cmake 2014-03-17 19:18:29.000000000 +0100
++++ cmake-3.0.0-rc2/Modules/FindRuby.cmake 2014-03-20 02:44:47.693351223 +0100
+@@ -116,7 +116,7 @@
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
# vendor_ruby available ?
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org