Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2015-02-11 16:31:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-25 21:13:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2015-02-11 16:31:15.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Feb 6 16:41:28 UTC 2015 - f...@grueninger.de + +- Update to 3.1.2 + install: Fix regression in default configuration selection + CPack: Fix packaging of source tarballs with symbolic links + KWSys Directory: Check opendir return value before using it (#15367) + Help: Clarify status of link_libraries command + Normalize OBJECT_DEPENDS paths to match custom commands (#15366) + MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385) + FeatureSummary: Fix bracket in documentation. + FindOpenSSL: fix detection of OpenSSL 1.0.2 + ctest_build: Update GNU make error message matching (#15379) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2015-01-25 21:13:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2015-02-11 16:31:15.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Feb 6 16:40:53 UTC 2015 - f...@grueninger.de + +- Update to 3.1.2 + install: Fix regression in default configuration selection + CPack: Fix packaging of source tarballs with symbolic links + KWSys Directory: Check opendir return value before using it (#15367) + Help: Clarify status of link_libraries command + Normalize OBJECT_DEPENDS paths to match custom commands (#15366) + MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385) + FeatureSummary: Fix bracket in documentation. + FindOpenSSL: fix detection of OpenSSL 1.0.2 + ctest_build: Update GNU make error message matching (#15379) + +------------------------------------------------------------------- Old: ---- cmake-3.1.1.tar.gz New: ---- cmake-3.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.mnAiWp/_old 2015-02-11 16:31:16.000000000 +0100 +++ /var/tmp/diff_new_pack.mnAiWp/_new 2015-02-11 16:31:16.000000000 +0100 @@ -17,7 +17,7 @@ Name: cmake-gui -Version: 3.1.1 +Version: 3.1.2 Release: 0 %define rversion %{version} Summary: CMake graphical user interface cmake.spec: same change ++++++ cmake-3.1.1.tar.gz -> cmake-3.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Help/command/link_libraries.rst new/cmake-3.1.2/Help/command/link_libraries.rst --- old/cmake-3.1.1/Help/command/link_libraries.rst 2015-01-21 15:10:25.000000000 +0100 +++ new/cmake-3.1.2/Help/command/link_libraries.rst 2015-02-04 21:36:43.000000000 +0100 @@ -1,16 +1,19 @@ link_libraries -------------- -Deprecated. Use the target_link_libraries() command instead. - Link libraries to all targets added later. :: - link_libraries(library1 <debug | optimized> library2 ...) + link_libraries([item1 [item2 [...]]] + [[debug|optimized|general] <item>] ...) + +Specify libraries or flags to use when linking any targets created later in +the current directory or below by commands such as :command:`add_executable` +or :command:`add_library`. See the :command:`target_link_libraries` command +for meaning of arguments. -Specify a list of libraries to be linked into any following targets -(typically added with the add_executable or add_library calls). This -command is passed down to all subdirectories. The debug and optimized -strings may be used to indicate that the next library listed is to be -used only for that specific type of build. +.. note:: + The :command:`target_link_libraries` command should be preferred whenever + possible. Library dependencies are chained automatically, so directory-wide + specification of link libraries is rarely needed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Help/manual/cmake-commands.7.rst new/cmake-3.1.2/Help/manual/cmake-commands.7.rst --- old/cmake-3.1.1/Help/manual/cmake-commands.7.rst 2015-01-21 15:10:25.000000000 +0100 +++ new/cmake-3.1.2/Help/manual/cmake-commands.7.rst 2015-02-04 21:36:43.000000000 +0100 @@ -67,6 +67,7 @@ /command/include /command/install /command/link_directories + /command/link_libraries /command/list /command/load_cache /command/load_command @@ -117,7 +118,6 @@ /command/install_files /command/install_programs /command/install_targets - /command/link_libraries /command/make_directory /command/output_required_files /command/remove diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Modules/FeatureSummary.cmake new/cmake-3.1.2/Modules/FeatureSummary.cmake --- old/cmake-3.1.1/Modules/FeatureSummary.cmake 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Modules/FeatureSummary.cmake 2015-02-04 21:36:43.000000000 +0100 @@ -40,7 +40,7 @@ # [FATAL_ON_MISSING_REQUIRED_PACKAGES] # [DESCRIPTION "Found packages:"] # WHAT (ALL | PACKAGES_FOUND | PACKAGES_NOT_FOUND -# | ENABLED_FEATURES | DISABLED_FEATURES] +# | ENABLED_FEATURES | DISABLED_FEATURES) # ) # # @@ -265,7 +265,7 @@ # Does the same as SET_PACKAGE_INFO(<name> <description> <url> ) #============================================================================= -# Copyright 2007-2009 Kitware, Inc. +# Copyright 2007-2015 Kitware, Inc. # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Modules/FindOpenSSL.cmake new/cmake-3.1.2/Modules/FindOpenSSL.cmake --- old/cmake-3.1.1/Modules/FindOpenSSL.cmake 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Modules/FindOpenSSL.cmake 2015-02-04 21:36:43.000000000 +0100 @@ -279,7 +279,7 @@ set(OPENSSL_VERSION "${_OPENSSL_VERSION}") elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str - REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") # The version number is encoded as 0xMNNFFPPS: major minor fix patch status # The status gives if this is a developer or prerelease and is ignored here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Modules/Platform/Windows-MSVC.cmake new/cmake-3.1.2/Modules/Platform/Windows-MSVC.cmake --- old/cmake-3.1.1/Modules/Platform/Windows-MSVC.cmake 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Modules/Platform/Windows-MSVC.cmake 2015-02-04 21:36:43.000000000 +0100 @@ -235,7 +235,7 @@ # shared linker flags set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) -set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) +set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) set (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) set (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) # module linker flags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Modules/Platform/Windows-df.cmake new/cmake-3.1.2/Modules/Platform/Windows-df.cmake --- old/cmake-3.1.1/Modules/Platform/Windows-df.cmake 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Modules/Platform/Windows-df.cmake 2015-02-04 21:36:43.000000000 +0100 @@ -62,7 +62,7 @@ set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) -set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) +set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) set (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) set (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Source/CMakeVersion.cmake new/cmake-3.1.2/Source/CMakeVersion.cmake --- old/cmake-3.1.1/Source/CMakeVersion.cmake 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Source/CMakeVersion.cmake 2015-02-04 21:36:43.000000000 +0100 @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 1) -set(CMake_VERSION_PATCH 1) +set(CMake_VERSION_PATCH 2) #set(CMake_VERSION_RC 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Source/CPack/cmCPackGenerator.cxx new/cmake-3.1.2/Source/CPack/cmCPackGenerator.cxx --- old/cmake-3.1.1/Source/CPack/cmCPackGenerator.cxx 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Source/CPack/cmCPackGenerator.cxx 2015-02-04 21:36:43.000000000 +0100 @@ -437,6 +437,18 @@ cmCPackLogger(cmCPackLog::LOG_DEBUG, "Will create a symlink: " << symlinkedIt->second << "--> " << symlinkedIt->first << std::endl); + // make sure directory exists for symlink + std::string destDir = + cmSystemTools::GetFilenamePath(symlinkedIt->second); + if(!destDir.empty() && !cmSystemTools::MakeDirectory(destDir)) + { + cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot create dir: " + << destDir + << "\nTrying to create symlink: " + << symlinkedIt->second << "--> " + << symlinkedIt->first + << std::endl); + } if (!cmSystemTools::CreateSymlink((symlinkedIt->first).c_str(), (symlinkedIt->second).c_str())) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Source/CTest/cmCTestBuildHandler.cxx new/cmake-3.1.2/Source/CTest/cmCTestBuildHandler.cxx --- old/cmake-3.1.1/Source/CTest/cmCTestBuildHandler.cxx 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Source/CTest/cmCTestBuildHandler.cxx 2015-02-04 21:36:43.000000000 +0100 @@ -70,13 +70,13 @@ "^CMake Error.*:", ":[ \\t]cannot find", ":[ \\t]can't find", - ": \\*\\*\\* No rule to make target \\`.*\\'. Stop", + ": \\*\\*\\* No rule to make target \\[`'].*\\'. Stop", ": \\*\\*\\* No targets specified and no makefile found", ": Invalid loader fixup for symbol", ": Invalid fixups exist", ": Can't find library for", ": internal link edit command failed", - ": Unrecognized option \\`.*\\'", + ": Unrecognized option \\[`'].*\\'", "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\([^WI]\\)", "ld: 0706-006 Cannot find or open library file: -l ", "ild: \\(argument error\\) can't find library argument ::", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Source/cmGeneratorTarget.cxx new/cmake-3.1.2/Source/cmGeneratorTarget.cxx --- old/cmake-3.1.1/Source/cmGeneratorTarget.cxx 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Source/cmGeneratorTarget.cxx 2015-02-04 21:36:43.000000000 +0100 @@ -676,6 +676,14 @@ { std::vector<std::string> objDeps; cmSystemTools::ExpandListArgument(additionalDeps, objDeps); + for(std::vector<std::string>::iterator odi = objDeps.begin(); + odi != objDeps.end(); ++odi) + { + if (cmSystemTools::FileIsFullPath(*odi)) + { + *odi = cmSystemTools::CollapseFullPath(*odi); + } + } this->FollowNames(objDeps); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Source/cmLocalGenerator.cxx new/cmake-3.1.2/Source/cmLocalGenerator.cxx --- old/cmake-3.1.1/Source/cmLocalGenerator.cxx 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Source/cmLocalGenerator.cxx 2015-02-04 21:36:43.000000000 +0100 @@ -390,27 +390,23 @@ this->Makefile->GetConfigurations(configurationTypes, false); // Choose a default install configuration. - const char* default_config = config.c_str(); + std::string default_config = config; const char* default_order[] = {"RELEASE", "MINSIZEREL", "RELWITHDEBINFO", "DEBUG", 0}; - for(const char** c = default_order; *c && !default_config; ++c) + for(const char** c = default_order; *c && default_config.empty(); ++c) { for(std::vector<std::string>::iterator i = configurationTypes.begin(); i != configurationTypes.end(); ++i) { if(cmSystemTools::UpperCase(*i) == *c) { - default_config = i->c_str(); + default_config = *i; } } } - if(!default_config && !configurationTypes.empty()) + if(default_config.empty() && !configurationTypes.empty()) { - default_config = configurationTypes[0].c_str(); - } - if(!default_config) - { - default_config = "Release"; + default_config = configurationTypes[0]; } // Create the install script file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Source/cmNinjaTargetGenerator.cxx new/cmake-3.1.2/Source/cmNinjaTargetGenerator.cxx --- old/cmake-3.1.1/Source/cmNinjaTargetGenerator.cxx 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Source/cmNinjaTargetGenerator.cxx 2015-02-04 21:36:43.000000000 +0100 @@ -600,6 +600,14 @@ if(const char* objectDeps = source->GetProperty("OBJECT_DEPENDS")) { std::vector<std::string> depList; cmSystemTools::ExpandListArgument(objectDeps, depList); + for(std::vector<std::string>::iterator odi = depList.begin(); + odi != depList.end(); ++odi) + { + if (cmSystemTools::FileIsFullPath(*odi)) + { + *odi = cmSystemTools::CollapseFullPath(*odi); + } + } std::transform(depList.begin(), depList.end(), std::back_inserter(implicitDeps), MapToNinjaPath()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Source/kwsys/Directory.cxx new/cmake-3.1.2/Source/kwsys/Directory.cxx --- old/cmake-3.1.1/Source/kwsys/Directory.cxx 2015-01-21 15:10:26.000000000 +0100 +++ new/cmake-3.1.2/Source/kwsys/Directory.cxx 2015-02-04 21:36:44.000000000 +0100 @@ -239,6 +239,11 @@ { DIR* dir = opendir(name.c_str()); + if (!dir) + { + return 0; + } + unsigned long count = 0; for (dirent* d = readdir(dir); d; d = readdir(dir) ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Tests/CustomCommand/CMakeLists.txt new/cmake-3.1.2/Tests/CustomCommand/CMakeLists.txt --- old/cmake-3.1.1/Tests/CustomCommand/CMakeLists.txt 2015-01-21 15:10:27.000000000 +0100 +++ new/cmake-3.1.2/Tests/CustomCommand/CMakeLists.txt 2015-02-04 21:36:44.000000000 +0100 @@ -153,6 +153,19 @@ ${PROJECT_BINARY_DIR}/foo.c ) +# Test using OBJECT_DEPENDS to bring in a custom command. +# Use a path that can be simplified to make sure paths +# are consistently normalized. +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/subdir/../subdir/subdir.h + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/subdir.h.in + ${CMAKE_CURRENT_BINARY_DIR}/subdir/subdir.h + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/subdir.h.in + ) +set_property(SOURCE ${PROJECT_BINARY_DIR}/foo.c PROPERTY + OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/subdir/../subdir/subdir.h) + # Add custom command to generate not_included.h, which is a header # file that is not included by any source in this project. This will # test whether all custom command outputs explicitly listed as sources diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Tests/CustomCommand/foo.in new/cmake-3.1.2/Tests/CustomCommand/foo.in --- old/cmake-3.1.1/Tests/CustomCommand/foo.in 2015-01-21 15:10:27.000000000 +0100 +++ new/cmake-3.1.2/Tests/CustomCommand/foo.in 2015-02-04 21:36:44.000000000 +0100 @@ -7,6 +7,11 @@ int generated(); int wrapped(); +#include "subdir/subdir.h" +#ifndef SUBDIR_DEF +# error SUBDIR_DEF not defined +#endif + int main () { if (generated()*wrapped()*doc() == 3*5*7) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.1.1/Tests/CustomCommand/subdir.h.in new/cmake-3.1.2/Tests/CustomCommand/subdir.h.in --- old/cmake-3.1.1/Tests/CustomCommand/subdir.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.1.2/Tests/CustomCommand/subdir.h.in 2015-02-04 21:36:44.000000000 +0100 @@ -0,0 +1 @@ +#define SUBDIR_DEF -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org