Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-06-08 13:36:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-17 22:01:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-06-08 13:37:01.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Jun 1 08:22:13 UTC 2014 - f...@grueninger.de + +- Update to 3.0.0~rc6 + * CMP0022: Fix link language propagation in NEW behavior + * KWSys SystemTools: Port cygwin path conversion to modern API + * KWSys Process: Workaround child kill trouble on Cygwin + * cmSystemTools::RenameFile: Retry on Windows ERROR_SHARING_VIOLATION + * FindCUDA: Use CUDA_NVCC_FLAGS* for separable compilation + +------------------------------------------------------------------- cmake.changes: same change Old: ---- cmake-3.0.0-rc5.tar.gz New: ---- cmake-3.0.0-rc6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.lc9Ibn/_old 2014-06-08 13:37:02.000000000 +0200 +++ /var/tmp/diff_new_pack.lc9Ibn/_new 2014-06-08 13:37:02.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake-gui -Version: 3.0.0~rc5 +Version: 3.0.0~rc6 Release: 0 -%define rversion 3.0.0-rc5 +%define rversion 3.0.0-rc6 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.lc9Ibn/_old 2014-06-08 13:37:02.000000000 +0200 +++ /var/tmp/diff_new_pack.lc9Ibn/_new 2014-06-08 13:37:02.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake -Version: 3.0.0~rc5 +Version: 3.0.0~rc6 Release: 0 -%define rversion 3.0.0-rc5 +%define rversion 3.0.0-rc6 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz Source1: cmake.macros ++++++ cmake-3.0.0-rc5.tar.gz -> cmake-3.0.0-rc6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc5/Modules/FindCUDA.cmake new/cmake-3.0.0-rc6/Modules/FindCUDA.cmake --- old/cmake-3.0.0-rc5/Modules/FindCUDA.cmake 2014-05-13 17:15:35.000000000 +0200 +++ new/cmake-3.0.0-rc6/Modules/FindCUDA.cmake 2014-05-22 17:58:31.000000000 +0200 @@ -1418,15 +1418,24 @@ if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 ) list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"") endif() + # Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG} + set(config_specific_flags) set(flags) foreach(config ${CUDA_configuration_types}) string(TOUPPER ${config} config_upper) + # Add config specific flags + foreach(f ${CUDA_NVCC_FLAGS_${config_upper}}) + list(APPEND config_specific_flags $<$<CONFIG:${config}>:${f}>) + endforeach() set(important_host_flags) _cuda_get_important_host_flags(important_host_flags ${CMAKE_${CUDA_C_OR_CXX}_FLAGS_${config_upper}}) foreach(f ${important_host_flags}) list(APPEND flags $<$<CONFIG:${config}>:-Xcompiler> $<$<CONFIG:${config}>:${f}>) endforeach() endforeach() + # Add our general CUDA_NVCC_FLAGS with the configuration specifig flags + set(nvcc_flags ${CUDA_NVCC_FLAGS} ${config_specific_flags} ${nvcc_flags}) + file(RELATIVE_PATH output_file_relative_path "${CMAKE_BINARY_DIR}" "${output_file}") # Some generators don't handle the multiple levels of custom command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc5/Source/CMakeVersion.cmake new/cmake-3.0.0-rc6/Source/CMakeVersion.cmake --- old/cmake-3.0.0-rc5/Source/CMakeVersion.cmake 2014-05-13 17:15:35.000000000 +0200 +++ new/cmake-3.0.0-rc6/Source/CMakeVersion.cmake 2014-05-22 17:58:31.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 5) +set(CMake_VERSION_RC 6) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc5/Source/cmSystemTools.cxx new/cmake-3.0.0-rc6/Source/cmSystemTools.cxx --- old/cmake-3.0.0-rc5/Source/cmSystemTools.cxx 2014-05-13 17:15:35.000000000 +0200 +++ new/cmake-3.0.0-rc6/Source/cmSystemTools.cxx 2014-05-22 17:58:31.000000000 +0200 @@ -917,8 +917,10 @@ cmsys::Encoding::ToWide(newname).c_str(), MOVEFILE_REPLACE_EXISTING) && --retry.Count) { - // Try again only if failure was due to access permissions. - if(GetLastError() != ERROR_ACCESS_DENIED) + DWORD last_error = GetLastError(); + // Try again only if failure was due to access/sharing permissions. + if(last_error != ERROR_ACCESS_DENIED && + last_error != ERROR_SHARING_VIOLATION) { return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc5/Source/cmTarget.cxx new/cmake-3.0.0-rc6/Source/cmTarget.cxx --- old/cmake-3.0.0-rc5/Source/cmTarget.cxx 2014-05-13 17:15:35.000000000 +0200 +++ new/cmake-3.0.0-rc6/Source/cmTarget.cxx 2014-05-22 17:58:31.000000000 +0200 @@ -5515,11 +5515,6 @@ } } } - if(this->LinkLanguagePropagatesToDependents()) - { - // Targets using this archive need its language runtime libraries. - iface.Languages = impl->Languages; - } } } } @@ -5536,11 +5531,6 @@ iface.ImplementationIsInterface = true; iface.Libraries = impl->Libraries; iface.WrongConfigLibraries = impl->WrongConfigLibraries; - if(this->LinkLanguagePropagatesToDependents()) - { - // Targets using this archive need its language runtime libraries. - iface.Languages = impl->Languages; - } if(this->PolicyStatusCMP0022 == cmPolicies::WARN && !this->Internal->PolicyWarnedCMP0022) @@ -5607,6 +5597,16 @@ } } + if(this->LinkLanguagePropagatesToDependents()) + { + // Targets using this archive need its language runtime libraries. + if(LinkImplementation const* impl = + this->GetLinkImplementation(config, headTarget)) + { + iface.Languages = impl->Languages; + } + } + if(this->GetType() == cmTarget::STATIC_LIBRARY) { // How many repetitions are needed if this library has cyclic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc5/Source/kwsys/ProcessUNIX.c new/cmake-3.0.0-rc6/Source/kwsys/ProcessUNIX.c --- old/cmake-3.0.0-rc5/Source/kwsys/ProcessUNIX.c 2014-05-13 17:15:35.000000000 +0200 +++ new/cmake-3.0.0-rc6/Source/kwsys/ProcessUNIX.c 2014-05-22 17:58:31.000000000 +0200 @@ -2413,6 +2413,12 @@ /* Suspend the process to be sure it will not create more children. */ kill(process_id, SIGSTOP); +#if defined(__CYGWIN__) + /* Some Cygwin versions seem to need help here. Give up our time slice + so that the child can process SIGSTOP before we send SIGKILL. */ + usleep(1); +#endif + /* Kill all children if we can find them. */ #if defined(__linux__) || defined(__CYGWIN__) /* First try using the /proc filesystem. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc5/Source/kwsys/SystemTools.cxx new/cmake-3.0.0-rc6/Source/kwsys/SystemTools.cxx --- old/cmake-3.0.0-rc5/Source/kwsys/SystemTools.cxx 2014-05-13 17:15:35.000000000 +0200 +++ new/cmake-3.0.0-rc6/Source/kwsys/SystemTools.cxx 2014-05-22 17:58:31.000000000 +0200 @@ -92,7 +92,7 @@ #endif #ifdef __CYGWIN__ -extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path); +# include <sys/cygwin.h> #endif // getpwnam doesn't exist on Windows and Cray Xt3/Catamount @@ -1110,7 +1110,10 @@ } else { - cygwin_conv_to_win32_path(path, win32_path); + if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0) + { + win32_path[0] = 0; + } SystemToolsTranslationMap::value_type entry(path, win32_path); SystemTools::Cyg2Win32Map->insert(entry); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc5/Tests/Fortran/CMakeLists.txt new/cmake-3.0.0-rc6/Tests/Fortran/CMakeLists.txt --- old/cmake-3.0.0-rc5/Tests/Fortran/CMakeLists.txt 2014-05-13 17:15:35.000000000 +0200 +++ new/cmake-3.0.0-rc6/Tests/Fortran/CMakeLists.txt 2014-05-22 17:58:32.000000000 +0200 @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.6) +cmake_minimum_required (VERSION 3.0) project(testf C CXX Fortran) if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
