Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-06-18 07:49:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-08 13:37:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-06-18 07:50:21.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 11 04:41:58 UTC 2014 - f...@grueninger.de + +- Update to 3.0.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2014-06-08 13:37:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2014-06-18 07:50:21.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 11 04:40:51 UTC 2014 - f...@grueninger.de + +- Update to 3.0.0 + +------------------------------------------------------------------- Old: ---- cmake-3.0.0-rc6.tar.gz New: ---- cmake-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.WRdyW0/_old 2014-06-18 07:50:22.000000000 +0200 +++ /var/tmp/diff_new_pack.WRdyW0/_new 2014-06-18 07:50:22.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake-gui -Version: 3.0.0~rc6 +Version: 3.0.0 Release: 0 -%define rversion 3.0.0-rc6 +%define rversion 3.0.0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/cmake-%{rversion}.tar.gz Summary: CMake graphical user interface @@ -51,7 +51,7 @@ %description This is a Graphical User Interface for CMake, a cross-platform, -open-source make system. +open-source build system. %prep %setup -q -n cmake-%{rversion} ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.WRdyW0/_old 2014-06-18 07:50:22.000000000 +0200 +++ /var/tmp/diff_new_pack.WRdyW0/_new 2014-06-18 07:50:22.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake -Version: 3.0.0~rc6 +Version: 3.0.0 Release: 0 -%define rversion 3.0.0-rc6 +%define rversion 3.0.0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz Source1: cmake.macros @@ -46,7 +46,7 @@ Requires: make %description -CMake is a cross-platform, open-source make system +CMake is a cross-platform, open-source build system %prep %setup -q -n %{name}-%{rversion} ++++++ cmake-3.0.0-rc6.tar.gz -> cmake-3.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/CONTRIBUTING.rst new/cmake-3.0.0/CONTRIBUTING.rst --- old/cmake-3.0.0-rc6/CONTRIBUTING.rst 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/CONTRIBUTING.rst 2014-06-09 17:46:51.000000000 +0200 @@ -4,10 +4,10 @@ Community ========= -CMake is maintained by `Kitware, Inc.`_ and developed in +CMake is maintained and supported by `Kitware`_ and developed in collaboration with a productive community of contributors. -.. _`Kitware, Inc.`: http://www.kitware.com +.. _`Kitware`: http://www.kitware.com/cmake The preferred entry point for new contributors is the mailing list. Please subscribe and post to the `CMake Developers List`_ to offer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Help/command/target_include_directories.rst new/cmake-3.0.0/Help/command/target_include_directories.rst --- old/cmake-3.0.0-rc6/Help/command/target_include_directories.rst 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Help/command/target_include_directories.rst 2014-06-09 17:46:51.000000000 +0200 @@ -40,3 +40,17 @@ 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. + +Include directories usage requirements commonly differ between the build-tree +and the install-tree. The ``BUILD_INTERFACE`` and ``INSTALL_INTERFACE`` +generator expressions can be used to describe separate usage requirements +based on the usage location. Relative paths are allowed within the +``INSTALL_INTERFACE`` expression and are interpreted relative to the +installation prefix. For example: + +.. code-block:: cmake + + target_include_directories(mylib PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/mylib> + $<INSTALL_INTERFACE:include/mylib> # <prefix>/include/mylib + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Help/manual/cmake-buildsystem.7.rst new/cmake-3.0.0/Help/manual/cmake-buildsystem.7.rst --- old/cmake-3.0.0-rc6/Help/manual/cmake-buildsystem.7.rst 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Help/manual/cmake-buildsystem.7.rst 2014-06-09 17:46:51.000000000 +0200 @@ -578,9 +578,19 @@ Include directories usage requirements commonly differ between the build-tree and the install-tree. The ``BUILD_INTERFACE`` and ``INSTALL_INTERFACE`` generator expressions can be used to describe separate usage requirements -based on the usage location. Relative paths are allowed within these -expressions, and are interpreted relative to the current source directory -or the installation prefix, as appropriate. +based on the usage location. Relative paths are allowed within the +``INSTALL_INTERFACE`` expression and are interpreted relative to the +installation prefix. For example: + +.. code-block:: cmake + + add_library(ClimbingStats climbingstats.cpp) + target_include_directories(ClimbingStats INTERFACE + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated> + $<INSTALL_INTERFACE:/absolute/path> + $<INSTALL_INTERFACE:relative/path> + $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/$<CONFIG>/generated> + ) Two convenience APIs are provided relating to include directories usage requirements. The :variable:`CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE` variable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst new/cmake-3.0.0/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst --- old/cmake-3.0.0-rc6/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst 2014-06-09 17:46:51.000000000 +0200 @@ -3,6 +3,10 @@ List of public include directories for a library. +The :command:`target_include_directories` command populates this property +with values given to the ``PUBLIC`` and ``INTERFACE`` keywords. Projects +may also get and set the property directly. + Targets may populate this property to publish the include directories required to compile against the headers for the target. Consuming targets can add entries to their own :prop_tgt:`INCLUDE_DIRECTORIES` @@ -13,3 +17,17 @@ 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. + +Include directories usage requirements commonly differ between the build-tree +and the install-tree. The ``BUILD_INTERFACE`` and ``INSTALL_INTERFACE`` +generator expressions can be used to describe separate usage requirements +based on the usage location. Relative paths are allowed within the +``INSTALL_INTERFACE`` expression and are interpreted relative to the +installation prefix. For example: + +.. code-block:: cmake + + set_property(TARGET mylib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/mylib> + $<INSTALL_INTERFACE:include/mylib> # <prefix>/include/mylib + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Modules/Platform/Windows-GNU.cmake new/cmake-3.0.0/Modules/Platform/Windows-GNU.cmake --- old/cmake-3.0.0-rc6/Modules/Platform/Windows-GNU.cmake 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Modules/Platform/Windows-GNU.cmake 2014-06-09 17:46:52.000000000 +0200 @@ -151,6 +151,7 @@ find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars32.bat DOC "Visual Studio vcvars32.bat" PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin" @@ -160,9 +161,10 @@ ) set(CMAKE_GNUtoMS_ARCH x86) elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) - find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvarsamd64.bat + find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars64.bat vcvarsamd64.bat DOC "Visual Studio vcvarsamd64.bat" PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin/amd64" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin/amd64" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin/amd64" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin/amd64" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/README.rst new/cmake-3.0.0/README.rst --- old/cmake-3.0.0-rc6/README.rst 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/README.rst 2014-06-09 17:46:52.000000000 +0200 @@ -11,10 +11,10 @@ .. _`CMake Home Page`: http://www.cmake.org .. _`CMake Documentation Page`: http://www.cmake.org/cmake/help/documentation.html -CMake is maintained by `Kitware, Inc.`_ and developed in +CMake is maintained and supported by `Kitware`_ and developed in collaboration with a productive community of contributors. -.. _`Kitware, Inc.`: http://www.kitware.com +.. _`Kitware`: http://www.kitware.com/cmake License ======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Source/CMakeVersion.cmake new/cmake-3.0.0/Source/CMakeVersion.cmake --- old/cmake-3.0.0-rc6/Source/CMakeVersion.cmake 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Source/CMakeVersion.cmake 2014-06-09 17:46:52.000000000 +0200 @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 6) +#set(CMake_VERSION_RC 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Source/QtDialog/CMakeSetupDialog.cxx new/cmake-3.0.0/Source/QtDialog/CMakeSetupDialog.cxx --- old/cmake-3.0.0-rc6/Source/QtDialog/CMakeSetupDialog.cxx 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Source/QtDialog/CMakeSetupDialog.cxx 2014-06-09 17:46:52.000000000 +0200 @@ -812,7 +812,7 @@ { QString msg = tr( "CMake %1 (cmake.org).\n" - "CMake suite maintained by Kitware, Inc. (kitware.com).\n" + "CMake suite maintained and supported by Kitware (kitware.com/cmake).\n" "Distributed under terms of the BSD 3-Clause License.\n" "\n" "CMake GUI maintained by csimsoft,\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Source/cmCacheManager.cxx new/cmake-3.0.0/Source/cmCacheManager.cxx --- old/cmake-3.0.0-rc6/Source/cmCacheManager.cxx 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Source/cmCacheManager.cxx 2014-06-09 17:46:52.000000000 +0200 @@ -750,11 +750,7 @@ } e.SetProperty("HELPSTRING", helpString? helpString : "(This variable does not exist and should not be used)"); - if (this->Cache[key].Value == e.Value) - { - this->CMakeInstance->UnwatchUnusedCli(key); - } - this->Cache[key] = e; + this->CMakeInstance->UnwatchUnusedCli(key); } bool cmCacheManager::CacheIterator::IsAtEnd() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Source/cmDocumentation.cxx new/cmake-3.0.0/Source/cmDocumentation.cxx --- old/cmake-3.0.0-rc6/Source/cmDocumentation.cxx 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Source/cmDocumentation.cxx 2014-06-09 17:46:52.000000000 +0200 @@ -102,7 +102,7 @@ this->GetNameString() << " version " << cmVersion::GetCMakeVersion() << "\n" "\n" - "CMake suite maintained by Kitware, Inc. (kitware.com).\n" + "CMake suite maintained and supported by Kitware (kitware.com/cmake).\n" ; return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Source/cmake.cxx new/cmake-3.0.0/Source/cmake.cxx --- old/cmake-3.0.0-rc6/Source/cmake.cxx 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Source/cmake.cxx 2014-06-09 17:46:52.000000000 +0200 @@ -1231,7 +1231,10 @@ if(ci.Find(save.key.c_str())) { save.type = ci.GetType(); - save.help = ci.GetProperty("HELPSTRING"); + if(const char* help = ci.GetProperty("HELPSTRING")) + { + save.help = help; + } } saved.push_back(save); } @@ -2664,11 +2667,17 @@ } if(!it.Find("CMAKE_GENERATOR")) { - std::cerr << "Error: could find generator in Cache\n"; + std::cerr << "Error: could not find CMAKE_GENERATOR in Cache\n"; return 1; } cmsys::auto_ptr<cmGlobalGenerator> gen( this->CreateGlobalGenerator(it.GetValue())); + if(!gen.get()) + { + std::cerr << "Error: could create CMAKE_GENERATOR \"" + << it.GetValue() << "\"\n"; + return 1; + } std::string output; std::string projName; if(!it.Find("CMAKE_PROJECT_NAME")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Source/ctest.cxx new/cmake-3.0.0/Source/ctest.cxx --- old/cmake-3.0.0-rc6/Source/ctest.cxx 2014-05-22 17:58:31.000000000 +0200 +++ new/cmake-3.0.0/Source/ctest.cxx 2014-06-09 17:46:52.000000000 +0200 @@ -44,7 +44,8 @@ {"-V,--verbose", "Enable verbose output from tests."}, {"-VV,--extra-verbose", "Enable more verbose output from tests."}, {"--debug", "Displaying more verbose internals of CTest."}, - {"--output-on-failure"}, + {"--output-on-failure", "Output anything outputted by the test program " + "if the test should fail."}, {"-F", "Enable failover."}, {"-j <jobs>, --parallel <jobs>", "Run the tests in parallel using the" "given number of jobs."}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/RunCMakeTest.cmake new/cmake-3.0.0/Tests/RunCMake/CommandLine/RunCMakeTest.cmake --- old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/RunCMakeTest.cmake 2014-05-22 17:58:32.000000000 +0200 +++ new/cmake-3.0.0/Tests/RunCMake/CommandLine/RunCMakeTest.cmake 2014-06-09 17:46:53.000000000 +0200 @@ -1,5 +1,12 @@ include(RunCMake) +run_cmake_command(build-no-cache + ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}) +run_cmake_command(build-no-generator + ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-no-generator) +run_cmake_command(build-bad-generator + ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-bad-generator) + if(UNIX) run_cmake_command(E_create_symlink-missing-dir ${CMAKE_COMMAND} -E create_symlink T missing-dir/L diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-bad-generator-result.txt new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-bad-generator-result.txt --- old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-bad-generator-result.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-bad-generator-result.txt 2014-06-09 17:46:53.000000000 +0200 @@ -0,0 +1 @@ +1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt --- old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt 2014-06-09 17:46:53.000000000 +0200 @@ -0,0 +1 @@ +^Error: could create CMAKE_GENERATOR "Bad Generator"$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-no-cache-result.txt new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-no-cache-result.txt --- old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-no-cache-result.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-no-cache-result.txt 2014-06-09 17:46:53.000000000 +0200 @@ -0,0 +1 @@ +1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-no-cache-stderr.txt new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-no-cache-stderr.txt --- old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-no-cache-stderr.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-no-cache-stderr.txt 2014-06-09 17:46:53.000000000 +0200 @@ -0,0 +1 @@ +^Error: could not load cache$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-no-generator-result.txt new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-no-generator-result.txt --- old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-no-generator-result.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-no-generator-result.txt 2014-06-09 17:46:53.000000000 +0200 @@ -0,0 +1 @@ +1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-no-generator-stderr.txt new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-no-generator-stderr.txt --- old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/build-no-generator-stderr.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0/Tests/RunCMake/CommandLine/build-no-generator-stderr.txt 2014-06-09 17:46:53.000000000 +0200 @@ -0,0 +1 @@ +^Error: could not find CMAKE_GENERATOR in Cache$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt new/cmake-3.0.0/Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt --- old/cmake-3.0.0-rc6/Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0/Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt 2014-06-09 17:46:53.000000000 +0200 @@ -0,0 +1 @@ +CMAKE_GENERATOR:INTERNAL=Bad Generator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc6/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c new/cmake-3.0.0/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c --- old/cmake-3.0.0-rc6/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c 2014-05-22 17:58:33.000000000 +0200 +++ new/cmake-3.0.0/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c 2014-06-09 17:46:55.000000000 +0200 @@ -2861,7 +2861,7 @@ #endif } -#ifdef F_SETTIMES /* Tru64 */ +#ifdef F_SETTIMES static int set_time_tru64(int fd, int mode, const char *name, time_t atime, long atime_nsec, @@ -2869,19 +2869,21 @@ time_t ctime, long ctime_nsec) { struct attr_timbuf tstamp; - struct timeval times[3]; - times[0].tv_sec = atime; - times[0].tv_usec = atime_nsec / 1000; - times[1].tv_sec = mtime; - times[1].tv_usec = mtime_nsec / 1000; - times[2].tv_sec = ctime; - times[2].tv_usec = ctime_nsec / 1000; - tstamp.atime = times[0]; - tstamp.mtime = times[1]; - tstamp.ctime = times[2]; + tstamp.atime.tv_sec = atime; + tstamp.mtime.tv_sec = mtime; + tstamp.ctime.tv_sec = ctime; +#if defined (__hpux) && defined (__ia64) + tstamp.atime.tv_nsec = atime_nsec; + tstamp.mtime.tv_nsec = mtime_nsec; + tstamp.ctime.tv_nsec = ctime_nsec; +#else + tstamp.atime.tv_usec = atime_nsec / 1000; + tstamp.mtime.tv_usec = mtime_nsec / 1000; + tstamp.ctime.tv_usec = ctime_nsec / 1000; +#endif return (fcntl(fd,F_SETTIMES,&tstamp)); } -#endif /* Tru64 */ +#endif /* F_SETTIMES */ static int set_times(struct archive_write_disk *a, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
