Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked
in at 2014-09-17 17:41:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-13
08:48:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-09-17
17:41:58.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 12 17:01:21 UTC 2014 - idon...@suse.com
+
+- Update to version 3.0.2
+ * No changes to the GUI
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2014-09-02
08:22:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2014-09-17
17:41:58.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Sep 12 16:59:17 UTC 2014 - idon...@suse.com
+
+- Update to version 3.0.2
+ * ExternalProject: Avoid infinite loop on file download
+ hash mismatch
+ * CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behavior
+ * CMP0022: Fix version documented to support
+ LINK_PUBLIC/LINK_PRIVATE
+ * cmListFileLexer: Fix lexing of single '[' character (#15092)
+ * Fix finding binutils when cross-compiling with Clang
+ * QtAutogen: Use the basename for resource files.
+ * QtAutogen: Fix use of multiple ui files in a single target.
+
+-------------------------------------------------------------------
Old:
----
cmake-3.0.1.tar.gz
New:
----
cmake-3.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake-gui.spec ++++++
--- /var/tmp/diff_new_pack.CWPTxo/_old 2014-09-17 17:42:00.000000000 +0200
+++ /var/tmp/diff_new_pack.CWPTxo/_new 2014-09-17 17:42:00.000000000 +0200
@@ -17,7 +17,7 @@
Name: cmake-gui
-Version: 3.0.1
+Version: 3.0.2
Release: 0
Summary: CMake graphical user interface
License: BSD-3-Clause
cmake.spec: same change
++++++ cmake-3.0.1.tar.gz -> cmake-3.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Help/policy/CMP0022.rst
new/cmake-3.0.2/Help/policy/CMP0022.rst
--- old/cmake-3.0.1/Help/policy/CMP0022.rst 2014-07-31 17:03:56.000000000
+0200
+++ new/cmake-3.0.2/Help/policy/CMP0022.rst 2014-09-11 15:24:00.000000000
+0200
@@ -22,7 +22,7 @@
target_link_libraries command will no longer populate the properties
matching LINK_INTERFACE_LIBRARIES(_<CONFIG>)? if this policy is NEW.
-Warning-free future-compatible code which works with CMake 2.8.9 onwards
+Warning-free future-compatible code which works with CMake 2.8.7 onwards
can be written by using the ``LINK_PRIVATE`` and ``LINK_PUBLIC`` keywords
of :command:`target_link_libraries`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Modules/BundleUtilities.cmake
new/cmake-3.0.2/Modules/BundleUtilities.cmake
--- old/cmake-3.0.1/Modules/BundleUtilities.cmake 2014-07-31
17:03:56.000000000 +0200
+++ new/cmake-3.0.2/Modules/BundleUtilities.cmake 2014-09-11
15:24:00.000000000 +0200
@@ -237,6 +237,7 @@
file(READ "${bundle}/Contents/Info.plist" info_plist)
string(REGEX REPLACE ";" "\\\\;" info_plist "${info_plist}")
string(REGEX REPLACE "\n" "${eol_char};" info_plist "${info_plist}")
+ string(REGEX REPLACE "\r" "${eol_char};" info_plist "${info_plist}")
# Scan the lines for "<key>CFBundleExecutable</key>" - the line after that
# is the name of the main executable.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Modules/CMakeDetermineCCompiler.cmake
new/cmake-3.0.2/Modules/CMakeDetermineCCompiler.cmake
--- old/cmake-3.0.1/Modules/CMakeDetermineCCompiler.cmake 2014-07-31
17:03:56.000000000 +0200
+++ new/cmake-3.0.2/Modules/CMakeDetermineCCompiler.cmake 2014-09-11
15:24:00.000000000 +0200
@@ -136,7 +136,9 @@
if (COMPILER_BASENAME MATCHES
"^(.+-)(clang|g?cc)(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
- set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
+ if(CMAKE_C_COMPILER_TARGET)
+ set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
+ endif()
elseif(COMPILER_BASENAME MATCHES "qcc(\\.exe)?$")
if(CMAKE_C_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?.*$")
set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Modules/CMakeDetermineCXXCompiler.cmake
new/cmake-3.0.2/Modules/CMakeDetermineCXXCompiler.cmake
--- old/cmake-3.0.1/Modules/CMakeDetermineCXXCompiler.cmake 2014-07-31
17:03:56.000000000 +0200
+++ new/cmake-3.0.2/Modules/CMakeDetermineCXXCompiler.cmake 2014-09-11
15:24:00.000000000 +0200
@@ -133,7 +133,9 @@
if (COMPILER_BASENAME MATCHES
"^(.+-)(clan)?[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
+ if(CMAKE_CXX_COMPILER_TARGET)
+ set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
+ endif()
elseif(COMPILER_BASENAME MATCHES "QCC(\\.exe)?$")
if(CMAKE_CXX_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?.*$")
set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Modules/ExternalProject.cmake
new/cmake-3.0.2/Modules/ExternalProject.cmake
--- old/cmake-3.0.1/Modules/ExternalProject.cmake 2014-07-31
17:03:56.000000000 +0200
+++ new/cmake-3.0.2/Modules/ExternalProject.cmake 2014-09-11
15:24:00.000000000 +0200
@@ -607,6 +607,7 @@
file(REMOVE \"\${file}\")
execute_process(COMMAND \${CMAKE_COMMAND} -P \"${download_script}\")
endif()
+ math(EXPR attempt \"\${attempt} + 1\")
endwhile()
if(\${succeeded})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Source/CMakeVersion.cmake
new/cmake-3.0.2/Source/CMakeVersion.cmake
--- old/cmake-3.0.1/Source/CMakeVersion.cmake 2014-07-31 17:03:56.000000000
+0200
+++ new/cmake-3.0.2/Source/CMakeVersion.cmake 2014-09-11 15:24:00.000000000
+0200
@@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 0)
-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.0.1/Source/cmGlobalGenerator.cxx
new/cmake-3.0.2/Source/cmGlobalGenerator.cxx
--- old/cmake-3.0.1/Source/cmGlobalGenerator.cxx 2014-07-31
17:03:57.000000000 +0200
+++ new/cmake-3.0.2/Source/cmGlobalGenerator.cxx 2014-09-11
15:24:01.000000000 +0200
@@ -804,6 +804,14 @@
case cmPolicies::OLD:
// OLD behavior is to convert QCC to GNU.
mf->AddDefinition(compilerIdVar.c_str(), "GNU");
+ if(lang == "C")
+ {
+ mf->AddDefinition("CMAKE_COMPILER_IS_GNUCC", "1");
+ }
+ else if(lang == "CXX")
+ {
+ mf->AddDefinition("CMAKE_COMPILER_IS_GNUCXX", "1");
+ }
break;
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Source/cmGlobalXCodeGenerator.cxx
new/cmake-3.0.2/Source/cmGlobalXCodeGenerator.cxx
--- old/cmake-3.0.1/Source/cmGlobalXCodeGenerator.cxx 2014-07-31
17:03:57.000000000 +0200
+++ new/cmake-3.0.2/Source/cmGlobalXCodeGenerator.cxx 2014-09-11
15:24:01.000000000 +0200
@@ -837,16 +837,14 @@
cmTarget& cmtarget,
const std::string &lang)
{
- std::string fname = fullpath;
- cmXCodeObject* fileRef = this->FileRefs[fname];
+ cmStdString key = GetGroupMapKeyFromPath(cmtarget, fullpath);
+ cmXCodeObject* fileRef = this->FileRefs[key];
if(!fileRef)
{
fileRef = this->CreateObject(cmXCodeObject::PBXFileReference);
- std::string comment = fname;
- fileRef->SetComment(fname.c_str());
- this->FileRefs[fname] = fileRef;
+ fileRef->SetComment(fullpath.c_str());
+ this->FileRefs[key] = fileRef;
}
- cmStdString key = GetGroupMapKeyFromPath(cmtarget, fullpath);
cmXCodeObject* group = this->GroupMap[key];
cmXCodeObject* children = group->GetObject("children");
if (!children->HasObject(fileRef))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Source/cmListFileLexer.c
new/cmake-3.0.2/Source/cmListFileLexer.c
--- old/cmake-3.0.1/Source/cmListFileLexer.c 2014-07-31 17:03:57.000000000
+0200
+++ new/cmake-3.0.2/Source/cmListFileLexer.c 2014-09-11 15:24:01.000000000
+0200
@@ -369,8 +369,8 @@
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 23
-#define YY_END_OF_BUFFER 24
+#define YY_NUM_RULES 24
+#define YY_END_OF_BUFFER 25
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -381,10 +381,10 @@
static yyconst flex_int16_t yy_accept[77] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 4, 4,
- 24, 13, 21, 1, 15, 3, 13, 5, 6, 7,
- 22, 22, 16, 18, 19, 20, 10, 11, 8, 12,
- 9, 4, 13, 0, 13, 0, 21, 0, 0, 7,
- 13, 0, 13, 0, 2, 0, 13, 16, 0, 17,
+ 25, 13, 22, 1, 16, 3, 13, 5, 6, 7,
+ 15, 23, 17, 19, 20, 21, 10, 11, 8, 12,
+ 9, 4, 13, 0, 13, 0, 22, 0, 0, 7,
+ 13, 0, 13, 0, 2, 0, 13, 17, 0, 18,
10, 8, 4, 0, 14, 0, 0, 0, 0, 14,
0, 0, 14, 0, 0, 0, 2, 14, 0, 0,
0, 0, 0, 0, 0, 0
@@ -523,10 +523,10 @@
} ;
/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[24] =
+static yyconst flex_int32_t yy_rule_can_match_eol[25] =
{ 0,
-1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, };
+1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, };
/* The intent behind this definition is that it'll catch
* any uses of REJECT which flex missed.
@@ -615,7 +615,7 @@
-#line 621 "cmListFileLexer.c"
+#line 628 "cmListFileLexer.c"
#define INITIAL 0
#define STRING 1
@@ -850,7 +850,7 @@
#line 91 "cmListFileLexer.in.l"
-#line 858 "cmListFileLexer.c"
+#line 865 "cmListFileLexer.c"
if ( !yyg->yy_init )
{
@@ -1111,75 +1111,84 @@
YY_RULE_SETUP
#line 215 "cmListFileLexer.in.l"
{
+ lexer->token.type = cmListFileLexer_Token_ArgumentUnquoted;
+ cmListFileLexerSetToken(lexer, yytext, yyleng);
+ lexer->column += yyleng;
+ return 1;
+}
+case 16:
+YY_RULE_SETUP
+#line 222 "cmListFileLexer.in.l"
+{
lexer->token.type = cmListFileLexer_Token_ArgumentQuoted;
cmListFileLexerSetToken(lexer, "", 0);
lexer->column += yyleng;
BEGIN(STRING);
}
YY_BREAK
-case 16:
+case 17:
YY_RULE_SETUP
-#line 222 "cmListFileLexer.in.l"
+#line 229 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
lexer->column += yyleng;
}
YY_BREAK
-case 17:
-/* rule 17 can match eol */
+case 18:
+/* rule 18 can match eol */
YY_RULE_SETUP
-#line 227 "cmListFileLexer.in.l"
+#line 234 "cmListFileLexer.in.l"
{
/* Continuation: text is not part of string */
++lexer->line;
lexer->column = 1;
}
YY_BREAK
-case 18:
-/* rule 18 can match eol */
+case 19:
+/* rule 19 can match eol */
YY_RULE_SETUP
-#line 233 "cmListFileLexer.in.l"
+#line 240 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
++lexer->line;
lexer->column = 1;
}
YY_BREAK
-case 19:
+case 20:
YY_RULE_SETUP
-#line 239 "cmListFileLexer.in.l"
+#line 246 "cmListFileLexer.in.l"
{
lexer->column += yyleng;
BEGIN(INITIAL);
return 1;
}
-case 20:
+case 21:
YY_RULE_SETUP
-#line 245 "cmListFileLexer.in.l"
+#line 252 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
lexer->column += yyleng;
}
YY_BREAK
case YY_STATE_EOF(STRING):
-#line 250 "cmListFileLexer.in.l"
+#line 257 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_BadString;
BEGIN(INITIAL);
return 1;
}
-case 21:
+case 22:
YY_RULE_SETUP
-#line 256 "cmListFileLexer.in.l"
+#line 263 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_Space;
cmListFileLexerSetToken(lexer, yytext, yyleng);
lexer->column += yyleng;
return 1;
}
-case 22:
+case 23:
YY_RULE_SETUP
-#line 263 "cmListFileLexer.in.l"
+#line 270 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_BadCharacter;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -1188,18 +1197,18 @@
}
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(COMMENT):
-#line 270 "cmListFileLexer.in.l"
+#line 277 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_None;
cmListFileLexerSetToken(lexer, 0, 0);
return 0;
}
-case 23:
+case 24:
YY_RULE_SETUP
-#line 276 "cmListFileLexer.in.l"
+#line 283 "cmListFileLexer.in.l"
ECHO;
YY_BREAK
-#line 1220 "cmListFileLexer.c"
+#line 1238 "cmListFileLexer.c"
case YY_END_OF_BUFFER:
{
@@ -2320,7 +2329,7 @@
#define YYTABLES_NAME "yytables"
-#line 276 "cmListFileLexer.in.l"
+#line 282 "cmListFileLexer.in.l"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Source/cmListFileLexer.in.l
new/cmake-3.0.2/Source/cmListFileLexer.in.l
--- old/cmake-3.0.1/Source/cmListFileLexer.in.l 2014-07-31 17:03:57.000000000
+0200
+++ new/cmake-3.0.2/Source/cmListFileLexer.in.l 2014-09-11 15:24:01.000000000
+0200
@@ -212,6 +212,13 @@
return 1;
}
+\[ {
+ lexer->token.type = cmListFileLexer_Token_ArgumentUnquoted;
+ cmListFileLexerSetToken(lexer, yytext, yyleng);
+ lexer->column += yyleng;
+ return 1;
+}
+
\" {
lexer->token.type = cmListFileLexer_Token_ArgumentQuoted;
cmListFileLexerSetToken(lexer, "", 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Source/cmQtAutoGenerators.cxx
new/cmake-3.0.2/Source/cmQtAutoGenerators.cxx
--- old/cmake-3.0.1/Source/cmQtAutoGenerators.cxx 2014-07-31
17:03:57.000000000 +0200
+++ new/cmake-3.0.2/Source/cmQtAutoGenerators.cxx 2014-09-11
15:24:01.000000000 +0200
@@ -1786,8 +1786,8 @@
std::string::size_type matchOffset = 0;
- const std::string absPath = cmsys::SystemTools::GetFilenamePath(
- cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
+ const std::string realName =
+ cmsys::SystemTools::GetRealPath(absFilename.c_str());
matchOffset = 0;
if ((strstr(contentsString.c_str(), "ui_") != NULL)
@@ -1804,7 +1804,7 @@
// finding the correct header, so we need to remove the ui_ part
basename = basename.substr(3);
- includedUis[absPath] = basename;
+ includedUis[realName] = basename;
matchOffset += uiIncludeRegExp.end();
} while(uiIncludeRegExp.find(contentsString.c_str() + matchOffset));
@@ -1960,7 +1960,7 @@
return false;
}
-bool cmQtAutoGenerators::GenerateUi(const std::string& path,
+bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
const std::string& uiFileName)
{
if (!cmsys::SystemTools::FileExists(this->Builddir.c_str(), false))
@@ -1968,6 +1968,9 @@
cmsys::SystemTools::MakeDirectory(this->Builddir.c_str());
}
+ const std::string path = cmsys::SystemTools::GetFilenamePath(
+ realName.c_str()) + '/';
+
std::string ui_output_file = "ui_" + uiFileName + ".h";
std::string ui_input_file = path + uiFileName + ".ui";
@@ -2074,6 +2077,8 @@
}
}
+ command.push_back("-name");
+ command.push_back(basename);
command.push_back("-o");
command.push_back(rcc_output_file);
command.push_back(*si);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Source/cmQtAutoGenerators.h
new/cmake-3.0.2/Source/cmQtAutoGenerators.h
--- old/cmake-3.0.1/Source/cmQtAutoGenerators.h 2014-07-31 17:03:57.000000000
+0200
+++ new/cmake-3.0.2/Source/cmQtAutoGenerators.h 2014-09-11 15:24:01.000000000
+0200
@@ -48,7 +48,7 @@
bool RunAutogen(cmMakefile* makefile);
bool GenerateMoc(const std::string& sourceFile,
const std::string& mocFileName);
- bool GenerateUi(const std::string& path, const std::string& uiFileName);
+ bool GenerateUi(const std::string& realName, const std::string& uiFileName);
bool GenerateQrc();
void ParseCppFile(const std::string& absFilename,
const std::vector<std::string>& headerExtensions,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Source/kwsys/CPU.h.in
new/cmake-3.0.2/Source/kwsys/CPU.h.in
--- old/cmake-3.0.1/Source/kwsys/CPU.h.in 2014-07-31 17:03:57.000000000
+0200
+++ new/cmake-3.0.2/Source/kwsys/CPU.h.in 2014-09-11 15:24:01.000000000
+0200
@@ -80,6 +80,10 @@
#elif defined(__mips) || defined(__mips__) || defined(__MIPS__)
# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
+/* OpenRISC 1000 */
+#elif defined(__or1k__)
+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
+
/* RS/6000 */
#elif defined(__THW_RS600) || defined(_IBMR2) || defined(_POWER)
# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Tests/QtAutogen/CMakeLists.txt
new/cmake-3.0.2/Tests/QtAutogen/CMakeLists.txt
--- old/cmake-3.0.1/Tests/QtAutogen/CMakeLists.txt 2014-07-31
17:03:57.000000000 +0200
+++ new/cmake-3.0.2/Tests/QtAutogen/CMakeLists.txt 2014-09-11
15:24:01.000000000 +0200
@@ -64,9 +64,9 @@
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in"
)
-add_executable(QtAutogen main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp
abc.cpp
+add_executable(QtAutogen main.cpp calwidget.cpp second_widget.cpp foo.cpp
blub.cpp bar.cpp abc.cpp
xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot>
- test.qrc resourcetester.cpp generated.cpp
+ test.qrc second_resource.qrc resourcetester.cpp generated.cpp
)
set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS
generate_moc_input "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Tests/QtAutogen/resourcetester.cpp
new/cmake-3.0.2/Tests/QtAutogen/resourcetester.cpp
--- old/cmake-3.0.1/Tests/QtAutogen/resourcetester.cpp 2014-07-31
17:03:57.000000000 +0200
+++ new/cmake-3.0.2/Tests/QtAutogen/resourcetester.cpp 2014-09-11
15:24:01.000000000 +0200
@@ -16,6 +16,8 @@
{
if (!QFile::exists(":/CMakeLists.txt"))
qApp->exit(EXIT_FAILURE);
+ if (!QFile::exists(":/main.cpp"))
+ qApp->exit(EXIT_FAILURE);
QTimer::singleShot(0, qApp, SLOT(quit()));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Tests/QtAutogen/second_resource.qrc
new/cmake-3.0.2/Tests/QtAutogen/second_resource.qrc
--- old/cmake-3.0.1/Tests/QtAutogen/second_resource.qrc 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.0.2/Tests/QtAutogen/second_resource.qrc 2014-09-11
15:24:01.000000000 +0200
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+ <file>main.cpp</file>
+</qresource>
+</RCC>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Tests/QtAutogen/second_widget.cpp
new/cmake-3.0.2/Tests/QtAutogen/second_widget.cpp
--- old/cmake-3.0.1/Tests/QtAutogen/second_widget.cpp 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.0.2/Tests/QtAutogen/second_widget.cpp 2014-09-11
15:24:01.000000000 +0200
@@ -0,0 +1,14 @@
+
+#include "second_widget.h"
+#include "ui_second_widget.h"
+
+SecondWidget::SecondWidget(QWidget *parent)
+ : QWidget(parent), ui(new Ui::SecondWidget)
+{
+ ui->setupUi(this);
+}
+
+SecondWidget::~SecondWidget()
+{
+ delete ui;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Tests/QtAutogen/second_widget.h
new/cmake-3.0.2/Tests/QtAutogen/second_widget.h
--- old/cmake-3.0.1/Tests/QtAutogen/second_widget.h 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.0.2/Tests/QtAutogen/second_widget.h 2014-09-11
15:24:01.000000000 +0200
@@ -0,0 +1,19 @@
+
+#include <QWidget>
+
+namespace Ui
+{
+class SecondWidget;
+}
+
+class SecondWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ explicit SecondWidget(QWidget *parent = 0);
+
+ ~SecondWidget();
+
+private:
+ Ui::SecondWidget* ui;
+};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Tests/QtAutogen/second_widget.ui
new/cmake-3.0.2/Tests/QtAutogen/second_widget.ui
--- old/cmake-3.0.1/Tests/QtAutogen/second_widget.ui 1970-01-01
01:00:00.000000000 +0100
+++ new/cmake-3.0.2/Tests/QtAutogen/second_widget.ui 2014-09-11
15:24:01.000000000 +0200
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SecondWidget</class>
+ <widget class="QWidget" name="SecondWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <widget class="QPushButton" name="pushButton">
+ <property name="geometry">
+ <rect>
+ <x>80</x>
+ <y>20</y>
+ <width>94</width>
+ <height>24</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>PushButton</string>
+ </property>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cmake-3.0.1/Tests/RunCMake/Syntax/Unquoted1-stderr.txt
new/cmake-3.0.2/Tests/RunCMake/Syntax/Unquoted1-stderr.txt
--- old/cmake-3.0.1/Tests/RunCMake/Syntax/Unquoted1-stderr.txt 2014-07-31
17:03:57.000000000 +0200
+++ new/cmake-3.0.2/Tests/RunCMake/Syntax/Unquoted1-stderr.txt 2014-09-11
15:24:02.000000000 +0200
@@ -1 +1 @@
-^\[\]\[=\]\[\$\$\(MV\)-DSTR=" \[="\[;\]$
+^\[\]\[=\]\[\$\$\(MV\)-DSTR=" \[="\[;\]\]\[$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Tests/RunCMake/Syntax/Unquoted1.cmake
new/cmake-3.0.2/Tests/RunCMake/Syntax/Unquoted1.cmake
--- old/cmake-3.0.1/Tests/RunCMake/Syntax/Unquoted1.cmake 2014-07-31
17:03:57.000000000 +0200
+++ new/cmake-3.0.2/Tests/RunCMake/Syntax/Unquoted1.cmake 2014-09-11
15:24:02.000000000 +0200
@@ -1 +1 @@
-message([] [=] [$ $(MV) -DSTR=" [=" [;])
+message([] [=] [$ $(MV) -DSTR=" [=" [;] ] [)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.0.1/Utilities/KWIML/ABI.h.in
new/cmake-3.0.2/Utilities/KWIML/ABI.h.in
--- old/cmake-3.0.1/Utilities/KWIML/ABI.h.in 2014-07-31 17:03:58.000000000
+0200
+++ new/cmake-3.0.2/Utilities/KWIML/ABI.h.in 2014-09-11 15:24:02.000000000
+0200
@@ -398,6 +398,10 @@
#elif defined(__mips) || defined(__mips__) || defined(__MIPS__)
# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
+/* OpenRISC 1000 */
+#elif defined(__or1k__)
+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
+
/* RS/6000 */
#elif defined(__THW_RS600) || defined(_IBMR2) || defined(_POWER)
# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
