Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked
in at 2014-08-13 08:48:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-07-13
17:16:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-08-13
08:48:20.000000000 +0200
@@ -1,0 +2,17 @@
+Sun Aug 10 14:33:05 UTC 2014 - andreas.stie...@gmx.de
+
+- CMake 3.0.1:
+ * Ninja: Remove CMake includes from explicit depends
+ * KWSys SystemInformation: No SA_RESTART on QNX
+ * cmake: Fix read-after-free while checking command-line arguments
+ * Fortran: Add support for GNU >= 4.9 compressed modules
+ * bootstrap: Clarify name of configured source directory
+ * bootstrap: Fix "make test" and "make package" targets
+ * UseSWIG: Fix check for noproxy flag
+ * CMakeExpandImportedTargets: Do not read property on non-target
+ * Check*CompilerFlag: Avoid ';' in common pattern
+ * cmcurl: Fix a build failure with the Cray compiler on Linux
+ * FindQt4: Add nativewifi and qtga plugins
+ * QNX: Add missing flags for configurations and artifact creation.
+
+-------------------------------------------------------------------
cmake.changes: same change
Old:
----
cmake-3.0.0.tar.gz
New:
----
cmake-3.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake-gui.spec ++++++
--- /var/tmp/diff_new_pack.JSF063/_old 2014-08-13 08:48:21.000000000 +0200
+++ /var/tmp/diff_new_pack.JSF063/_new 2014-08-13 08:48:21.000000000 +0200
@@ -17,7 +17,7 @@
Name: cmake-gui
-Version: 3.0.0
+Version: 3.0.1
Release: 0
Summary: CMake graphical user interface
License: BSD-3-Clause
cmake.spec: same change
++++++ cmake-3.0.0.tar.gz -> cmake-3.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.0/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
new/cmake-3.0.1/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
--- old/cmake-3.0.0/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
2014-06-09 17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
2014-07-31 17:03:56.000000000 +0200
@@ -32,7 +32,7 @@
FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro
FAIL_REGEX "command option .* is not recognized" # XL
FAIL_REGEX "command option .* contains an incorrect subargument" # XL
- FAIL_REGEX "not supported in this configuration; ignored" # AIX
+ FAIL_REGEX "not supported in this configuration. ignored" # AIX
FAIL_REGEX "File with unknown suffix passed to linker" # PGI
FAIL_REGEX "WARNING: unknown flag:" # Open64
FAIL_REGEX "Incorrect command line option:" # Borland
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/CMakeExpandImportedTargets.cmake
new/cmake-3.0.1/Modules/CMakeExpandImportedTargets.cmake
--- old/cmake-3.0.0/Modules/CMakeExpandImportedTargets.cmake 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Modules/CMakeExpandImportedTargets.cmake 2014-07-31
17:03:56.000000000 +0200
@@ -71,7 +71,11 @@
set(_CCSR_NEW_REQ_LIBS )
set(_CHECK_FOR_IMPORTED_TARGETS FALSE)
foreach(_CURRENT_LIB ${_CCSR_REQ_LIBS})
- get_target_property(_importedConfigs "${_CURRENT_LIB}"
IMPORTED_CONFIGURATIONS)
+ if(TARGET "${_CURRENT_LIB}")
+ get_target_property(_importedConfigs "${_CURRENT_LIB}"
IMPORTED_CONFIGURATIONS)
+ else()
+ set(_importedConfigs "")
+ endif()
if (_importedConfigs)
# message(STATUS "Detected imported target ${_CURRENT_LIB}")
# Ok, so this is an imported target.
@@ -123,7 +127,11 @@
# all remaining imported target names (there shouldn't be any left anyway).
set(_CCSR_NEW_REQ_LIBS )
foreach(_CURRENT_LIB ${_CCSR_REQ_LIBS})
- get_target_property(_importedConfigs "${_CURRENT_LIB}"
IMPORTED_CONFIGURATIONS)
+ if(TARGET "${_CURRENT_LIB}")
+ get_target_property(_importedConfigs "${_CURRENT_LIB}"
IMPORTED_CONFIGURATIONS)
+ else()
+ set(_importedConfigs "")
+ endif()
if (NOT _importedConfigs)
list(APPEND _CCSR_NEW_REQ_LIBS "${_CURRENT_LIB}" )
# message(STATUS "final: appending ${_CURRENT_LIB}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/Compiler/QCC-C.cmake
new/cmake-3.0.1/Modules/Compiler/QCC-C.cmake
--- old/cmake-3.0.0/Modules/Compiler/QCC-C.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.0.1/Modules/Compiler/QCC-C.cmake 2014-07-31
17:03:56.000000000 +0200
@@ -0,0 +1,2 @@
+include(Compiler/QCC)
+__compiler_qcc(C)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/Compiler/QCC-CXX.cmake
new/cmake-3.0.1/Modules/Compiler/QCC-CXX.cmake
--- old/cmake-3.0.0/Modules/Compiler/QCC-CXX.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.0.1/Modules/Compiler/QCC-CXX.cmake 2014-07-31
17:03:56.000000000 +0200
@@ -0,0 +1,12 @@
+include(Compiler/QCC)
+__compiler_qcc(CXX)
+
+# If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the
+# default for the driver is not c++.
+set(CMAKE_CXX_COMPILE_OBJECT
+ "<CMAKE_CXX_COMPILER> -lang-c++ <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
+
+set(CMAKE_CXX_LINK_EXECUTABLE
+ "<CMAKE_CXX_COMPILER> -lang-c++ <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS>
<OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+
+set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fvisibility-inlines-hidden")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/Compiler/QCC.cmake
new/cmake-3.0.1/Modules/Compiler/QCC.cmake
--- old/cmake-3.0.0/Modules/Compiler/QCC.cmake 1970-01-01 01:00:00.000000000
+0100
+++ new/cmake-3.0.1/Modules/Compiler/QCC.cmake 2014-07-31 17:03:56.000000000
+0200
@@ -0,0 +1,24 @@
+
+#=============================================================================
+# Copyright 2002-2014 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+include(Compiler/GNU)
+
+macro(__compiler_qcc lang)
+ __compiler_gnu(${lang})
+
+ #
http://www.qnx.com/developers/docs/6.4.0/neutrino/utilities/q/qcc.html#examples
+ set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "-V")
+
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-Wp,-isystem,")
+ set(CMAKE_DEPFILE_FLAGS_${lang}
"-Wc,-MMD,<DEPFILE>,-MT,<OBJECT>,-MF,<DEPFILE>")
+endmacro()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/FindQt4.cmake
new/cmake-3.0.1/Modules/FindQt4.cmake
--- old/cmake-3.0.0/Modules/FindQt4.cmake 2014-06-09 17:46:52.000000000
+0200
+++ new/cmake-3.0.1/Modules/FindQt4.cmake 2014-07-31 17:03:56.000000000
+0200
@@ -1190,14 +1190,14 @@
set( QT_PLUGIN_TYPES accessible bearer codecs decorations designer
gfxdrivers graphicssystems iconengines imageformats inputmethods mousedrivers
phonon_backend script sqldrivers )
set( QT_ACCESSIBLE_PLUGINS qtaccessiblecompatwidgets qtaccessiblewidgets )
- set( QT_BEARER_PLUGINS qcorewlanbearer qgenericbearer )
+ set( QT_BEARER_PLUGINS qcorewlanbearer qgenericbearer qnativewifibearer )
set( QT_CODECS_PLUGINS qcncodecs qjpcodecs qkrcodecs qtwcodecs )
set( QT_DECORATIONS_PLUGINS qdecorationdefault qdecorationwindows )
set( QT_DESIGNER_PLUGINS arthurplugin containerextension customwidgetplugin
phononwidgets qdeclarativeview qt3supportwidgets qwebview taskmenuextension
worldtimeclockplugin )
set( QT_GRAPHICSDRIVERS_PLUGINS qgfxtransformed qgfxvnc qscreenvfb )
set( QT_GRAPHICSSYSTEMS_PLUGINS qglgraphicssystem qtracegraphicssystem )
set( QT_ICONENGINES_PLUGINS qsvgicon )
- set( QT_IMAGEFORMATS_PLUGINS qgif qjpeg qmng qico qsvg qtiff )
+ set( QT_IMAGEFORMATS_PLUGINS qgif qjpeg qmng qico qsvg qtiff qtga )
set( QT_INPUTMETHODS_PLUGINS qimsw_multi )
set( QT_MOUSEDRIVERS_PLUGINS qwstslibmousehandler )
if(APPLE)
@@ -1211,7 +1211,7 @@
set( QT_PHONON_PLUGINS ${QT_PHONON_BACKEND_PLUGINS} )
set( QT_QT3SUPPORT_PLUGINS qtaccessiblecompatwidgets )
set( QT_QTCORE_PLUGINS ${QT_BEARER_PLUGINS} ${QT_CODECS_PLUGINS} )
- set( QT_QTGUI_PLUGINS qtaccessiblewidgets qgif qjpeg qmng qico qtiff
${QT_DECORATIONS_PLUGINS} ${QT_GRAPHICSDRIVERS_PLUGINS}
${QT_GRAPHICSSYSTEMS_PLUGINS} ${QT_INPUTMETHODS_PLUGINS}
${QT_MOUSEDRIVERS_PLUGINS} )
+ set( QT_QTGUI_PLUGINS qtaccessiblewidgets ${QT_IMAGEFORMATS_PLUGINS}
${QT_DECORATIONS_PLUGINS} ${QT_GRAPHICSDRIVERS_PLUGINS}
${QT_GRAPHICSSYSTEMS_PLUGINS} ${QT_INPUTMETHODS_PLUGINS}
${QT_MOUSEDRIVERS_PLUGINS} )
set( QT_QTSCRIPT_PLUGINS ${QT_SCRIPT_PLUGINS} )
set( QT_QTSQL_PLUGINS ${QT_SQLDRIVERS_PLUGINS} )
set( QT_QTSVG_PLUGINS qsvg qsvgicon )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/Platform/QNX-QCC-C.cmake
new/cmake-3.0.1/Modules/Platform/QNX-QCC-C.cmake
--- old/cmake-3.0.0/Modules/Platform/QNX-QCC-C.cmake 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Modules/Platform/QNX-QCC-C.cmake 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-
-include(Platform/QNX)
-
-__compiler_qcc(C)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/Platform/QNX-QCC-CXX.cmake
new/cmake-3.0.1/Modules/Platform/QNX-QCC-CXX.cmake
--- old/cmake-3.0.0/Modules/Platform/QNX-QCC-CXX.cmake 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Modules/Platform/QNX-QCC-CXX.cmake 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-
-include(Platform/QNX)
-
-__compiler_qcc(CXX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/Platform/QNX.cmake
new/cmake-3.0.1/Modules/Platform/QNX.cmake
--- old/cmake-3.0.0/Modules/Platform/QNX.cmake 2014-06-09 17:46:52.000000000
+0200
+++ new/cmake-3.0.1/Modules/Platform/QNX.cmake 2014-07-31 17:03:56.000000000
+0200
@@ -1,5 +1,8 @@
set(QNXNTO 1)
+include(Platform/GNU)
+unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
+
set(CMAKE_DL_LIBS "")
# Shared libraries with no builtin soname may not be linked safely by
@@ -14,22 +17,3 @@
set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
endforeach()
-
-include(Platform/GNU)
-unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
-
-macro(__compiler_qcc lang)
- #
http://www.qnx.com/developers/docs/6.4.0/neutrino/utilities/q/qcc.html#examples
- set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "-V")
-
- set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-Wp,-isystem,")
- set(CMAKE_DEPFILE_FLAGS_${lang}
"-Wc,-MMD,<DEPFILE>,-MT,<OBJECT>,-MF,<DEPFILE>")
-
- if (lang STREQUAL CXX)
- # If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the
- # default for the driver is not c++.
- set(CMAKE_CXX_COMPILE_OBJECT
- "<CMAKE_CXX_COMPILER> -lang-c++ <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
- endif()
-
-endmacro()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/Platform/Windows-MSVC.cmake
new/cmake-3.0.1/Modules/Platform/Windows-MSVC.cmake
--- old/cmake-3.0.0/Modules/Platform/Windows-MSVC.cmake 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Modules/Platform/Windows-MSVC.cmake 2014-07-31
17:03:56.000000000 +0200
@@ -39,12 +39,14 @@
set(WIN32 1)
if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE")
- set(CMAKE_CREATE_WIN32_EXE "/subsystem:windowsce /entry:WinMainCRTStartup")
- set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:windowsce /entry:mainACRTStartup")
+ set(CMAKE_CREATE_WIN32_EXE "/entry:WinMainCRTStartup")
+ set(CMAKE_CREATE_CONSOLE_EXE "/entry:mainACRTStartup")
+ set(_PLATFORM_LINK_FLAGS " /subsystem:windowsce")
set(WINCE 1)
else()
set(CMAKE_CREATE_WIN32_EXE "/subsystem:windows")
set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:console")
+ set(_PLATFORM_LINK_FLAGS "")
endif()
if(CMAKE_GENERATOR MATCHES "Visual Studio 6")
@@ -235,7 +237,7 @@
set(_CMAKE_VS_LINK_EXE "<CMAKE_COMMAND> -E vs_link_exe ")
endif()
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
- "${_CMAKE_VS_LINK_DLL}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS>
${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB>
/pdb:<TARGET_PDB> /dll /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>
<LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
+ "${_CMAKE_VS_LINK_DLL}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS>
${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB>
/pdb:<TARGET_PDB> /dll
/version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS}
<LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
set(CMAKE_${lang}_CREATE_SHARED_MODULE
${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "<CMAKE_LINKER> /lib
${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ")
@@ -249,7 +251,7 @@
set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1)
set(CMAKE_${lang}_LINK_EXECUTABLE
- "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS>
${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB>
/pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>
<CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
+ "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS>
${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB>
/pdb:<TARGET_PDB>
/version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS}
<CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
set(CMAKE_${lang}_FLAGS_INIT
"${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} /D_WINDOWS
/W3${_FLAGS_${lang}}")
set(CMAKE_${lang}_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od ${_RTC1}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Modules/UseSWIG.cmake
new/cmake-3.0.1/Modules/UseSWIG.cmake
--- old/cmake-3.0.0/Modules/UseSWIG.cmake 2014-06-09 17:46:52.000000000
+0200
+++ new/cmake-3.0.1/Modules/UseSWIG.cmake 2014-07-31 17:03:56.000000000
+0200
@@ -57,7 +57,7 @@
set(SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG "${swig_lowercase_language}")
set(SWIG_MODULE_${name}_REAL_NAME "${name}")
- if (CMAKE_SWIG_FLAGS MATCHES "-noproxy")
+ if (";${CMAKE_SWIG_FLAGS};" MATCHES ";-noproxy;")
set (SWIG_MODULE_${name}_NOPROXY TRUE)
endif ()
if("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "UNKNOWN")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/CMakeVersion.cmake
new/cmake-3.0.1/Source/CMakeVersion.cmake
--- old/cmake-3.0.0/Source/CMakeVersion.cmake 2014-06-09 17:46:52.000000000
+0200
+++ new/cmake-3.0.1/Source/CMakeVersion.cmake 2014-07-31 17:03:56.000000000
+0200
@@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 0)
-set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_PATCH 1)
#set(CMake_VERSION_RC 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/cmDependsFortran.cxx
new/cmake-3.0.1/Source/cmDependsFortran.cxx
--- old/cmake-3.0.0/Source/cmDependsFortran.cxx 2014-06-09 17:46:52.000000000
+0200
+++ new/cmake-3.0.1/Source/cmDependsFortran.cxx 2014-07-31 17:03:56.000000000
+0200
@@ -765,7 +765,11 @@
const char* compilerId)
{
/*
- gnu:
+ gnu >= 4.9:
+ A mod file is an ascii file compressed with gzip.
+ Compiling twice produces identical modules.
+
+ gnu < 4.9:
A mod file is an ascii file.
<bar.mod>
FORTRAN module created from /path/to/foo.f90 on Sun Dec 30 22:47:58 2007
@@ -821,21 +825,30 @@
*/
if (strcmp(compilerId, "GNU") == 0 )
{
- const char seq[1] = {'\n'};
- const int seqlen = 1;
-
- if(!cmDependsFortranStreamContainsSequence(finModFile, seq, seqlen))
+ // GNU Fortran 4.9 and later compress .mod files with gzip
+ // but also do not include a date so we can fall through to
+ // compare them without skipping any prefix.
+ unsigned char hdr[2];
+ bool okay = finModFile.read(reinterpret_cast<char*>(hdr), 2)? true:false;
+ finModFile.seekg(0);
+ if(!(okay && hdr[0] == 0x1f && hdr[1] == 0x8b))
{
- // The module is of unexpected format. Assume it is different.
- std::cerr << compilerId << " fortran module " << modFile
- << " has unexpected format." << std::endl;
- return true;
- }
+ const char seq[1] = {'\n'};
+ const int seqlen = 1;
- if(!cmDependsFortranStreamContainsSequence(finStampFile, seq, seqlen))
- {
- // The stamp must differ if the sequence is not contained.
- return true;
+ if(!cmDependsFortranStreamContainsSequence(finModFile, seq, seqlen))
+ {
+ // The module is of unexpected format. Assume it is different.
+ std::cerr << compilerId << " fortran module " << modFile
+ << " has unexpected format." << std::endl;
+ return true;
+ }
+
+ if(!cmDependsFortranStreamContainsSequence(finStampFile, seq, seqlen))
+ {
+ // The stamp must differ if the sequence is not contained.
+ return true;
+ }
}
}
else if(strcmp(compilerId, "Intel") == 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/cmGlobalNinjaGenerator.cxx
new/cmake-3.0.1/Source/cmGlobalNinjaGenerator.cxx
--- old/cmake-3.0.0/Source/cmGlobalNinjaGenerator.cxx 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Source/cmGlobalNinjaGenerator.cxx 2014-07-31
17:03:57.000000000 +0200
@@ -972,7 +972,16 @@
{
knownDependencies.insert( ng->ConvertToNinjaPath( j->c_str() ) );
}
+ //get list files which are implicit dependencies as well and will be phony
+ //for rebuild manifest
+ std::vector<std::string> const& lf = (*i)->GetMakefile()->GetListFiles();
+ typedef std::vector<std::string>::const_iterator vect_it;
+ for(vect_it j = lf.begin(); j != lf.end(); ++j)
+ {
+ knownDependencies.insert( ng->ConvertToNinjaPath( j->c_str() ) );
+ }
}
+ knownDependencies.insert( "CMakeCache.txt" );
for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
li = this->EvaluationFiles.begin();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/cmGlobalXCodeGenerator.cxx
new/cmake-3.0.1/Source/cmGlobalXCodeGenerator.cxx
--- old/cmake-3.0.0/Source/cmGlobalXCodeGenerator.cxx 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Source/cmGlobalXCodeGenerator.cxx 2014-07-31
17:03:57.000000000 +0200
@@ -2298,7 +2298,7 @@
}
}
- buildSettings->AddAttribute("OTHER_LDFLAGS",
+ buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(target),
this->CreateString(extraLinkOptions.c_str()));
buildSettings->AddAttribute("OTHER_REZFLAGS",
this->CreateString(""));
@@ -2522,6 +2522,22 @@
}
//----------------------------------------------------------------------------
+const char*
+cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
+{
+ if(this->XcodeVersion >= 60 &&
+ (cmtarget.GetType() == cmTarget::STATIC_LIBRARY ||
+ cmtarget.GetType() == cmTarget::OBJECT_LIBRARY))
+ {
+ return "OTHER_LIBTOOLFLAGS";
+ }
+ else
+ {
+ return "OTHER_LDFLAGS";
+ }
+}
+
+//----------------------------------------------------------------------------
const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
{
switch(cmtarget.GetType())
@@ -2834,8 +2850,9 @@
sep = " ";
linkObjs += this->XCodeEscapePath(oi->c_str());
}
- this->AppendBuildSettingAttribute(target, "OTHER_LDFLAGS",
- linkObjs.c_str(), configName);
+ this->AppendBuildSettingAttribute(
+ target, this->GetTargetLinkFlagsVar(*cmtarget),
+ linkObjs.c_str(), configName);
}
// Skip link information for object libraries.
@@ -2913,8 +2930,9 @@
target->AddDependTarget(configName, li->Target->GetName());
}
}
- this->AppendBuildSettingAttribute(target, "OTHER_LDFLAGS",
- linkLibs.c_str(), configName);
+ this->AppendBuildSettingAttribute(
+ target, this->GetTargetLinkFlagsVar(*cmtarget),
+ linkLibs.c_str(), configName);
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/cmGlobalXCodeGenerator.h
new/cmake-3.0.1/Source/cmGlobalXCodeGenerator.h
--- old/cmake-3.0.0/Source/cmGlobalXCodeGenerator.h 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Source/cmGlobalXCodeGenerator.h 2014-07-31
17:03:57.000000000 +0200
@@ -141,6 +141,7 @@
cmXCodeObject* buildPhases);
void ForceLinkerLanguages();
void ForceLinkerLanguage(cmTarget& cmtarget);
+ const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
const char* GetTargetFileType(cmTarget& cmtarget);
const char* GetTargetProductType(cmTarget& cmtarget);
std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/cmInstallTargetGenerator.cxx
new/cmake-3.0.1/Source/cmInstallTargetGenerator.cxx
--- old/cmake-3.0.0/Source/cmInstallTargetGenerator.cxx 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Source/cmInstallTargetGenerator.cxx 2014-07-31
17:03:57.000000000 +0200
@@ -213,6 +213,20 @@
filesFrom.push_back(from1);
filesTo.push_back(to1);
}
+ else if(this->Target->IsCFBundleOnApple())
+ {
+ // Install the whole app bundle directory.
+ type = cmInstallType_DIRECTORY;
+ literal_args += " USE_SOURCE_PERMISSIONS";
+
+ std::string targetNameBase = targetName.substr(0, targetName.find('/'));
+
+ std::string from1 = fromDirConfig + targetNameBase;
+ std::string to1 = toDir + targetName;
+
+ filesFrom.push_back(from1);
+ filesTo.push_back(to1);
+ }
else
{
bool haveNamelink = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/cmSystemTools.cxx
new/cmake-3.0.1/Source/cmSystemTools.cxx
--- old/cmake-3.0.0/Source/cmSystemTools.cxx 2014-06-09 17:46:52.000000000
+0200
+++ new/cmake-3.0.1/Source/cmSystemTools.cxx 2014-07-31 17:03:57.000000000
+0200
@@ -2163,6 +2163,11 @@
cmSystemToolsCMakeCommand = exe_dir;
cmSystemToolsCMakeCommand += "/cmake";
cmSystemToolsCMakeCommand += cmSystemTools::GetExecutableExtension();
+#ifndef CMAKE_BUILD_WITH_CMAKE
+ // The bootstrap cmake does not provide the other tools,
+ // so use the directory where they are about to be built.
+ exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
+#endif
cmSystemToolsCTestCommand = exe_dir;
cmSystemToolsCTestCommand += "/ctest";
cmSystemToolsCTestCommand += cmSystemTools::GetExecutableExtension();
@@ -2215,7 +2220,7 @@
}
#else
// Bootstrap build knows its source.
- cmSystemToolsCMakeRoot = CMAKE_ROOT_DIR;
+ cmSystemToolsCMakeRoot = CMAKE_BOOTSTRAP_SOURCE_DIR;
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/cmake.cxx
new/cmake-3.0.1/Source/cmake.cxx
--- old/cmake-3.0.0/Source/cmake.cxx 2014-06-09 17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Source/cmake.cxx 2014-07-31 17:03:57.000000000 +0200
@@ -339,16 +339,24 @@
// The value is transformed if it is a filepath for example, so
// we can't compare whether the value is already in the cache until
// after we call AddCacheEntry.
- const char *cachedValue =
- this->CacheManager->GetCacheValue(var.c_str());
+ bool haveValue = false;
+ std::string cachedValue;
+ if(this->WarnUnusedCli)
+ {
+ if(const char *v = this->CacheManager->GetCacheValue(var.c_str()))
+ {
+ haveValue = true;
+ cachedValue = v;
+ }
+ }
this->CacheManager->AddCacheEntry(var.c_str(), value.c_str(),
"No help, variable specified on the command line.", type);
+
if(this->WarnUnusedCli)
{
- if (!cachedValue
- || strcmp(this->CacheManager->GetCacheValue(var.c_str()),
- cachedValue) != 0)
+ if (!haveValue ||
+ cachedValue != this->CacheManager->GetCacheValue(var.c_str()))
{
this->WatchUnusedCli(var.c_str());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Source/kwsys/SystemInformation.cxx
new/cmake-3.0.1/Source/kwsys/SystemInformation.cxx
--- old/cmake-3.0.0/Source/kwsys/SystemInformation.cxx 2014-06-09
17:46:52.000000000 +0200
+++ new/cmake-3.0.1/Source/kwsys/SystemInformation.cxx 2014-07-31
17:03:57.000000000 +0200
@@ -3696,7 +3696,10 @@
// install ours
struct sigaction sa;
sa.sa_sigaction=(SigAction)StacktraceSignalHandler;
- sa.sa_flags=SA_SIGINFO|SA_RESTART|SA_RESETHAND;
+ sa.sa_flags=SA_SIGINFO|SA_RESETHAND;
+# ifdef SA_RESTART
+ sa.sa_flags|=SA_RESTART;
+# endif
sigemptyset(&sa.sa_mask);
sigaction(SIGABRT,&sa,0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/Utilities/cmcurl/hostip.c
new/cmake-3.0.1/Utilities/cmcurl/hostip.c
--- old/cmake-3.0.0/Utilities/cmcurl/hostip.c 2014-06-09 17:46:54.000000000
+0200
+++ new/cmake-3.0.1/Utilities/cmcurl/hostip.c 2014-07-31 17:03:58.000000000
+0200
@@ -609,7 +609,7 @@
h = &buf->hostentry;
h->h_addr_list = &buf->h_addr_list[0];
addrentry = &buf->addrentry;
-#ifdef _CRAYC
+#ifdef _CRAY
/* On UNICOS, s_addr is a bit field and for some reason assigning to it
* doesn't work. There must be a better fix than this ugly hack.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.0/bootstrap new/cmake-3.0.1/bootstrap
--- old/cmake-3.0.0/bootstrap 2014-06-09 17:46:55.000000000 +0200
+++ new/cmake-3.0.1/bootstrap 2014-07-31 17:03:58.000000000 +0200
@@ -1474,9 +1474,11 @@
# When bootstrapping on MinGW with MSYS we must convert the source
# directory to a windows path.
if ${cmake_system_mingw}; then
- cmake_root_dir=`cd "${cmake_source_dir}"; pwd -W`
+ CMAKE_BOOTSTRAP_SOURCE_DIR=`cd "${cmake_source_dir}"; pwd -W`
+ CMAKE_BOOTSTRAP_BINARY_DIR=`cd "${cmake_binary_dir}"; pwd -W`
else
- cmake_root_dir="${cmake_source_dir}"
+ CMAKE_BOOTSTRAP_SOURCE_DIR="${cmake_source_dir}"
+ CMAKE_BOOTSTRAP_BINARY_DIR="${cmake_binary_dir}"
fi
# Write CMake version
@@ -1484,7 +1486,8 @@
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_MINOR
${cmake_version_minor}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_PATCH
${cmake_version_patch}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION
\"${cmake_version}\""
-cmake_report cmConfigure.h${_tmp} "#define CMAKE_ROOT_DIR
\"${cmake_root_dir}\""
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR
\"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR
\"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR
\"/bootstrap-not-insalled\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
