Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit cmake
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 29 Jan 2008 01:32:44 +0100
  • Message-id: <20080129003245.03496678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package cmake
checked in at Tue Jan 29 01:32:44 CET 2008.

--------
--- cmake/cmake.changes 2008-01-25 19:35:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2008-01-28
07:42:40.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 28 07:42:21 CET 2008 - dmueller@xxxxxxx
+
+- update to 2.4.8:
+ * version number increase, no linux specific changes
+
+-------------------------------------------------------------------

Old:
----
cmake-2.4.8-RC-12.tar.bz2

New:
----
cmake-2.4.8.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cmake.spec ++++++
--- /var/tmp/diff_new_pack.Q12078/_old 2008-01-29 01:32:04.000000000 +0100
+++ /var/tmp/diff_new_pack.Q12078/_new 2008-01-29 01:32:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cmake (Version 2.4.7+2.4.8RC12)
+# spec file for package cmake (Version 2.4.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,11 +11,11 @@
# norootforbuild

Name: cmake
-Version: 2.4.7+2.4.8RC12
-Release: 6
+Version: 2.4.8
+Release: 1
License: BSD 3-Clause
Group: Development/Tools/Building
-%define tar_version 2.4.8-RC-12
+%define tar_version 2.4.8
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 1020
BuildRequires: libexpat-devel
@@ -79,6 +79,9 @@
/usr/share/man/man1/ctest.1.gz

%changelog
+* Mon Jan 28 2008 dmueller@xxxxxxx
+- update to 2.4.8:
+ * version number increase, no linux specific changes
* Fri Jan 25 2008 pcerny@xxxxxxx
- added zlib to BuildRequires
* Mon Jan 21 2008 coolo@xxxxxxx
@@ -166,7 +169,7 @@
- respect DESTDIR on installing kde3 icons
* Mon Aug 14 2006 coolo@xxxxxxx
- add SUSE default paths for Qt3
-* Mon Jul 31 2006 dmueller@xxxxxxx
+* Tue Aug 01 2006 dmueller@xxxxxxx
- 2.4.3 update:
* progress is now reported with makefiles
* Fix relative path problems in ADD_SUBDIRECTORY

++++++ cmake-2.4.8-RC-12.tar.bz2 -> cmake-2.4.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/cmake-2.4.8-RC-12/ChangeLog.manual
new/cmake-2.4.8/ChangeLog.manual
--- old/cmake-2.4.8-RC-12/ChangeLog.manual 2008-01-11 15:12:32.000000000
+0100
+++ new/cmake-2.4.8/ChangeLog.manual 2008-01-21 19:59:51.000000000 +0100
@@ -1,3 +1,9 @@
+Changes in CMake 2.4.8
+* MSVC90 now defined for vs 9
+Changes in CMake 2.4.8 RC 13
+* fix vs 9 so it works, again...
+* fix bug 6150, working directory can now change drives with vs custom commands
+* fix windows vista elevation issue with CMakeSetup.exe
Changes in CMake 2.4.8 RC 12
* Fix vs 9 so cmake can find it
* Fix bug 6230 MODULE install with versions was broken
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/cmake-2.4.8-RC-12/CMakeLists.txt
new/cmake-2.4.8/CMakeLists.txt
--- old/cmake-2.4.8-RC-12/CMakeLists.txt 2008-01-11 15:12:32.000000000
+0100
+++ new/cmake-2.4.8/CMakeLists.txt 2008-01-21 19:59:51.000000000 +0100
@@ -7,7 +7,7 @@
SET(CMake_VERSION_MINOR 4)
SET(CMake_VERSION_PATCH 8)
# for an actual release this should not be defined
-SET(CMake_VERSION_RC 12)
+#SET(CMake_VERSION_RC 13)
SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/cmake-2.4.8-RC-12/Modules/Platform/Windows-cl.cmake
new/cmake-2.4.8/Modules/Platform/Windows-cl.cmake
--- old/cmake-2.4.8-RC-12/Modules/Platform/Windows-cl.cmake 2008-01-11
15:12:33.000000000 +0100
+++ new/cmake-2.4.8/Modules/Platform/Windows-cl.cmake 2008-01-21
19:59:51.000000000 +0100
@@ -136,6 +136,10 @@
SET(MSVC80 1)
SET(CMAKE_COMPILER_2005 1)
ENDIF("${compilerVersion}" EQUAL 1400)
+ IF("${compilerVersion}" EQUAL 1500)
+ SET(MSVC90 1)
+ SET(MSVC80 0)
+ ENDIF("${compilerVersion}" EQUAL 1500)
IF("${compilerVersion}" GREATER 1400)
SET(MSVC80 1)
SET(CMAKE_COMPILER_2005 1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/cmake-2.4.8-RC-12/Modules/Platform/Windows-cl.cmake.in
new/cmake-2.4.8/Modules/Platform/Windows-cl.cmake.in
--- old/cmake-2.4.8-RC-12/Modules/Platform/Windows-cl.cmake.in 2008-01-11
15:12:33.000000000 +0100
+++ new/cmake-2.4.8/Modules/Platform/Windows-cl.cmake.in 2008-01-21
19:59:51.000000000 +0100
@@ -7,6 +7,7 @@
SET(MSVC70 @MSVC70@)
SET(MSVC71 @MSVC71@)
SET(MSVC80 @MSVC80@)
+SET(MSVC90 @MSVC90@)
SET(MSVC_IDE @MSVC_IDE@)
SET(MSVC_VERSION @MSVC_VERSION@)
SET(WIN32 1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/cmake-2.4.8-RC-12/Source/cmGlobalVisualStudio9Generator.cxx
new/cmake-2.4.8/Source/cmGlobalVisualStudio9Generator.cxx
--- old/cmake-2.4.8-RC-12/Source/cmGlobalVisualStudio9Generator.cxx
2008-01-11 15:12:34.000000000 +0100
+++ new/cmake-2.4.8/Source/cmGlobalVisualStudio9Generator.cxx 2008-01-21
19:59:52.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmGlobalVisualStudio9Generator.cxx,v $
Language: C++
- Date: $Date: 2007/12/18 20:58:48 $
- Version: $Revision: 1.4.2.1 $
+ Date: $Date: 2008/01/21 17:56:51 $
+ Version: $Revision: 1.4.2.2 $

Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -27,6 +27,11 @@
this->FindMakeProgramFile = "CMakeVS9FindMake.cmake";
}

+//----------------------------------------------------------------------------
+void cmGlobalVisualStudio9Generator::AddPlatformDefinitions(cmMakefile* mf)
+{
+ mf->AddDefinition("MSVC90", "1");
+}

void cmGlobalVisualStudio9Generator::WriteSLNHeader(std::ostream& fout)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/cmake-2.4.8-RC-12/Source/cmGlobalVisualStudio9Generator.h
new/cmake-2.4.8/Source/cmGlobalVisualStudio9Generator.h
--- old/cmake-2.4.8-RC-12/Source/cmGlobalVisualStudio9Generator.h
2008-01-11 15:12:34.000000000 +0100
+++ new/cmake-2.4.8/Source/cmGlobalVisualStudio9Generator.h 2008-01-21
19:59:52.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmGlobalVisualStudio9Generator.h,v $
Language: C++
- Date: $Date: 2007/12/18 20:58:48 $
- Version: $Revision: 1.2.2.1 $
+ Date: $Date: 2008/01/21 17:56:51 $
+ Version: $Revision: 1.2.2.2 $

Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -37,6 +37,7 @@
virtual const char* GetName() const {
return cmGlobalVisualStudio9Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 9 2008";}
+ virtual void AddPlatformDefinitions(cmMakefile* mf);

/** Get the documentation entry for this generator. */
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/cmake-2.4.8-RC-12/Source/cmLocalVisualStudio7Generator.cxx
new/cmake-2.4.8/Source/cmLocalVisualStudio7Generator.cxx
--- old/cmake-2.4.8-RC-12/Source/cmLocalVisualStudio7Generator.cxx
2008-01-11 15:12:35.000000000 +0100
+++ new/cmake-2.4.8/Source/cmLocalVisualStudio7Generator.cxx 2008-01-21
19:59:53.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmLocalVisualStudio7Generator.cxx,v $
Language: C++
- Date: $Date: 2007/12/12 03:28:45 $
- Version: $Revision: 1.125.2.15 $
+ Date: $Date: 2008/01/15 21:02:31 $
+ Version: $Revision: 1.125.2.16 $

Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -1461,14 +1461,7 @@
}
else
{
- if (this->Version == 8)
- {
- fout << "\tVersion=\"8.00\"\n";
- }
- else
- {
- fout << "\tVersion=\"7.00\"\n";
- }
+ fout << "\tVersion=\"" << this->Version << ".00\"\n";
}
const char* projLabel = target.GetProperty("PROJECT_LABEL");
if(!projLabel)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/cmake-2.4.8-RC-12/Source/cmLocalVisualStudioGenerator.cxx
new/cmake-2.4.8/Source/cmLocalVisualStudioGenerator.cxx
--- old/cmake-2.4.8-RC-12/Source/cmLocalVisualStudioGenerator.cxx
2008-01-11 15:12:35.000000000 +0100
+++ new/cmake-2.4.8/Source/cmLocalVisualStudioGenerator.cxx 2008-01-21
19:59:53.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmLocalVisualStudioGenerator.cxx,v $
Language: C++
- Date: $Date: 2007/03/16 22:05:42 $
- Version: $Revision: 1.2.2.5 $
+ Date: $Date: 2008/01/15 21:02:31 $
+ Version: $Revision: 1.2.2.6 $

Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -126,6 +126,15 @@
newline = newline_text;
script += "cd ";
script += this->Convert(workingDirectory, START_OUTPUT, SHELL);
+
+ // Change the working drive.
+ if(workingDirectory[0] && workingDirectory[1] == ':')
+ {
+ script += newline;
+ newline = newline_text;
+ script += workingDirectory[0];
+ script += workingDirectory[1];
+ }
}
// for visual studio IDE add extra stuff to the PATH
// if CMAKE_MSVCIDE_RUN_PATH is set.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/cmake-2.4.8-RC-12/Source/MFCDialog/CMakeLists.txt
new/cmake-2.4.8/Source/MFCDialog/CMakeLists.txt
--- old/cmake-2.4.8-RC-12/Source/MFCDialog/CMakeLists.txt 2008-01-11
15:12:39.000000000 +0100
+++ new/cmake-2.4.8/Source/MFCDialog/CMakeLists.txt 2008-01-21
19:59:55.000000000 +0100
@@ -30,4 +30,80 @@
ADD_EXECUTABLE(CMakeSetup WIN32 ${SRCS})
TARGET_LINK_LIBRARIES(CMakeSetup CMakeLib)
ADD_DEPENDENCIES(CMakeSetup cmake)
+
+
+# some older versions of cmake do not have
+# a patch version set so we need to set it
+# so that a later if will not fail, this has
+# to be done all the time for all generators
+# since if statements are evaluated even if
+# inside a false if, they must still parse so for
+# if (CMAKE_PATCH_VERSION GREATER 4) not to
+# fail CMAKE_PATCH_VERSION must be set
+IF(${CMAKE_MAJOR_VERSION} LESS 3)
+ IF(NOT DEFINED CMAKE_PATCH_VERSION)
+ SET(CMAKE_PATCH_VERSION 0)
+ ENDIF(NOT DEFINED CMAKE_PATCH_VERSION)
+ENDIF(${CMAKE_MAJOR_VERSION} LESS 3)
+
+# for MSVC greater than 71 assume mt is around
+# for other versions allow for the cache to be
+# seeded with a value for CMAKE_MT_EXECUTABLE
+# this allows for MSVC71 to build CMakeSetup that
+# will have the manifest stuff for windows vista
+IF(MSVC AND NOT MSVC60 AND NOT MSVC70 AND NOT MSVC71)
+ SET(CMAKE_MT_EXECUTABLE mt)
+ENDIF(MSVC AND NOT MSVC60 AND NOT MSVC70 AND NOT MSVC71)
+IF(CMAKE_MT_EXECUTABLE)
+ SET(exe "${CMAKE_CFG_INTDIR}/CMakeSetup.exe")
+ IF(EXECUTABLE_OUTPUT_PATH)
+ SET(exe "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/CMakeSetup.exe")
+ ENDIF(EXECUTABLE_OUTPUT_PATH)
+
+ # VERBATIM flag should be avoided if building with Visual Studio.
+ # (OK to add the flag if ${CMAKE_CFG_INTDIR} is "." which is one
+ # indicator that you are not building with Visual Studio.)
+ #
+ SET(verbatim_flag)
+ IF(NOT CMAKE_CONFIGURATION_TYPES)
+ # VERBATIM flag should also be avoided if using an older CMake.
+ # VERBATIM flag support was added in CMake 2.4.5
+ #
+ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 2.4)
+ IF(${CMAKE_PATCH_VERSION} GREATER 4)
+ SET(verbatim_flag "VERBATIM")
+ ENDIF(${CMAKE_PATCH_VERSION} GREATER 4)
+ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 2.4)
+
+ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+ SET(verbatim_flag "VERBATIM")
+ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+
+ IF(NOT verbatim_flag)
+ MESSAGE("${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): warning
+ warning: The VERBATIM flag for ADD_CUSTOM_COMMAND may be required to
execute mt correctly,
+ but you are using a CMake
${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} which does not parse the VERBATIM
flag.
+ Upgrade to CMake 2.4.5 or later to eliminate this warning.")
+ ENDIF(NOT verbatim_flag)
+ ENDIF(NOT CMAKE_CONFIGURATION_TYPES)
+
+ SET(_CMAKE_INPUT_RESOURCE "-inputresource:${exe};#1")
+ # if msvc71 then you can not replace the resource
+ # but you can add one, so set the input resource to empty
+ IF(MSVC71)
+ SET(_CMAKE_INPUT_RESOURCE )
+ ENDIF(MSVC71)
+ # Solve the "things named like *Setup prompt for admin privileges
+ # on Vista" problem by merging a manifest fragment that contains a
+ # requestedExecutionLevel element:
+ #
+ ADD_CUSTOM_COMMAND(TARGET CMakeSetup
+ POST_BUILD COMMAND mt
+ "${_CMAKE_INPUT_RESOURCE}"
+ -manifest "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetupManifest.xml"
+ "-outputresource:${exe};#1"
+ ${verbatim_flag}
+ )
+ENDIF(CMAKE_MT_EXECUTABLE)
+
INSTALL_TARGETS(/bin CMakeSetup)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/cmake-2.4.8-RC-12/Source/MFCDialog/CMakeSetupManifest.xml
new/cmake-2.4.8/Source/MFCDialog/CMakeSetupManifest.xml
--- old/cmake-2.4.8-RC-12/Source/MFCDialog/CMakeSetupManifest.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-2.4.8/Source/MFCDialog/CMakeSetupManifest.xml 2008-01-21
19:59:55.000000000 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
List Navigation