forked from pool/cmake
This commit is contained in:
parent
3bca3fb7f4
commit
24bf1ba89d
@ -1,13 +0,0 @@
|
|||||||
Subject: Fix CTest coverage xml generation.
|
|
||||||
Bugzilla: http://public.kitware.com/Bug/view.php?id=6988
|
|
||||||
--- Source/CTest/cmCTestCoverageHandler.cxx
|
|
||||||
+++ Source/CTest/cmCTestCoverageHandler.cxx
|
|
||||||
@@ -538,7 +538,7 @@ int cmCTestCoverageHandler::ProcessHandl
|
|
||||||
covSumFile << "\t<File Name=\"" << this->CTest->MakeXMLSafe(fileName)
|
|
||||||
<< "\" FullPath=\"" << this->CTest->MakeXMLSafe(
|
|
||||||
this->CTest->GetShortPathToFile(fullFileName.c_str()))
|
|
||||||
- << "\" Covered=\"" << (tested==0?"true":"false") << "\">\n"
|
|
||||||
+ << "\" Covered=\"" << (tested > 0?"true":"false") << "\">\n"
|
|
||||||
<< "\t\t<LOCTested>" << tested << "</LOCTested>\n"
|
|
||||||
<< "\t\t<LOCUnTested>" << untested << "</LOCUnTested>\n"
|
|
||||||
<< "\t\t<PercentCoverage>";
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:6ab80352491c5544ebc40bff029aa556092b2fe27f214a9a6be295dc46c9ad1d
|
|
||||||
size 2651730
|
|
3
cmake-2.6.1-RC-6.tar.bz2
Normal file
3
cmake-2.6.1-RC-6.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:fd6726edc86233d347f59c8fda80077f0a65d9a2359a8673e135e38fbc44c196
|
||||||
|
size 2675191
|
@ -1,3 +1,33 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 2 14:58:58 CEST 2008 - dmueller@suse.de
|
||||||
|
|
||||||
|
- update to 2.6.1-RC6:
|
||||||
|
* Fix DEFINITIONS property to be compatible with 2.4
|
||||||
|
* FindGettext.cmake fix bug #7230: don't ignore first parameter if it's
|
||||||
|
not ALL
|
||||||
|
* Add support for component based packages in cpack.
|
||||||
|
* Fix FindKDE3.cmake to not add flags if kde3 is not found
|
||||||
|
* Fix FindMatlab.cmake, FindOpenSSL.cmake, FindQt3.cmake,
|
||||||
|
FindSWIG.cmake, to only error if it is required
|
||||||
|
* Change to find_*, a new HINTS keyword was added to avoid the
|
||||||
|
need for NO_DEFAULT_PATH, and a repeated call to find_*
|
||||||
|
* Update all NO_DEFAULT_PATH usage in Modules/Find*
|
||||||
|
* Fix for cpack self extracting .sh files to work with more shells
|
||||||
|
* FindQt4 now finds dependencies for some qt modules
|
||||||
|
* Give a message if rpath is changed during install
|
||||||
|
* rpath changer during install understands symlinks now
|
||||||
|
* FindQt4 - make Qt not found if the QtCore library can't be found.
|
||||||
|
* UseQt4 - only add flags for modles that are used
|
||||||
|
* Fix incorrect extension extraction in gcc cross compiler check
|
||||||
|
* Add a way to modify depend scanning with the property:
|
||||||
|
IMPLICIT_DEPENDS_INCLUDE_TRANSFORM
|
||||||
|
* Fix -Wno-dev to not eat path to source tree
|
||||||
|
* Fix FindBoost version variable names to correct bug in Boost version
|
||||||
|
* Fix bug 0006990 CMake crashes with bad input to
|
||||||
|
set_source_files_properties
|
||||||
|
* Fix bug in FindCurses where you could not run cmake twice
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
Thu Jun 12 17:59:52 CEST 2008 - mrdocs@opensuse.org
|
Thu Jun 12 17:59:52 CEST 2008 - mrdocs@opensuse.org
|
||||||
|
|
||||||
- add %ifdefs to disable the cmake gui for non-Suse distros
|
- add %ifdefs to disable the cmake gui for non-Suse distros
|
||||||
|
37
cmake.spec
37
cmake.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package cmake (Version 2.6.0)
|
# spec file for package cmake (Version 2.6.1)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -12,18 +12,17 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: cmake
|
Name: cmake
|
||||||
Version: 2.6.0
|
Version: 2.6.1
|
||||||
Release: 18
|
Release: 1
|
||||||
License: BSD 3-Clause
|
License: BSD 3-Clause
|
||||||
Group: Development/Tools/Building
|
Group: Development/Tools/Building
|
||||||
%define tar_version 2.6.0
|
%define tar_version 2.6.1-RC-6
|
||||||
Url: http://www.cmake.org/
|
Url: http://www.cmake.org/
|
||||||
Source0: %{name}-%{tar_version}.tar.bz2
|
Source0: %{name}-%{tar_version}.tar.bz2
|
||||||
Patch0: cmake-2.6.0-use_intree_xmlrpc.patch
|
Patch0: cmake-2.6.0-use_intree_xmlrpc.patch
|
||||||
Patch1: cmake-2.4.7-less_verbosity.patch
|
Patch1: cmake-2.4.7-less_verbosity.patch
|
||||||
Patch2: cmake-2.6.0-use_shared_python_lib.patch
|
Patch2: cmake-2.6.0-use_shared_python_lib.patch
|
||||||
Patch4: cmake-disable-builtin-chrpath.diff
|
Patch4: cmake-disable-builtin-chrpath.diff
|
||||||
Patch5: cmake-2.6.0-fix_ctest_coverage.patch
|
|
||||||
Summary: Cross-platform, open-source make system
|
Summary: Cross-platform, open-source make system
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%if 0%{?suse_version} >= 1020
|
%if 0%{?suse_version} >= 1020
|
||||||
@ -67,7 +66,6 @@ Authors:
|
|||||||
#%patch1
|
#%patch1
|
||||||
%patch2
|
%patch2
|
||||||
%patch4
|
%patch4
|
||||||
%patch5
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
EXTRA_FLAGS=""
|
EXTRA_FLAGS=""
|
||||||
@ -103,6 +101,7 @@ rm -rf %{buildroot}
|
|||||||
/usr/bin/ccmake
|
/usr/bin/ccmake
|
||||||
/usr/share/cmake
|
/usr/share/cmake
|
||||||
%doc /usr/share/doc/packages/%name
|
%doc /usr/share/doc/packages/%name
|
||||||
|
%doc %_mandir/man1/cmakepolicies.1.*
|
||||||
%doc %_mandir/man1/cmake.1.*
|
%doc %_mandir/man1/cmake.1.*
|
||||||
%doc %_mandir/man1/ctest.1.*
|
%doc %_mandir/man1/ctest.1.*
|
||||||
%doc %_mandir/man1/ccmake.1.*
|
%doc %_mandir/man1/ccmake.1.*
|
||||||
@ -123,6 +122,32 @@ rm -rf %{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 02 2008 dmueller@suse.de
|
||||||
|
- update to 2.6.1-RC6:
|
||||||
|
* Fix DEFINITIONS property to be compatible with 2.4
|
||||||
|
* FindGettext.cmake fix bug #7230: don't ignore first parameter if it's
|
||||||
|
not ALL
|
||||||
|
* Add support for component based packages in cpack.
|
||||||
|
* Fix FindKDE3.cmake to not add flags if kde3 is not found
|
||||||
|
* Fix FindMatlab.cmake, FindOpenSSL.cmake, FindQt3.cmake,
|
||||||
|
FindSWIG.cmake, to only error if it is required
|
||||||
|
* Change to find_*, a new HINTS keyword was added to avoid the
|
||||||
|
need for NO_DEFAULT_PATH, and a repeated call to find_*
|
||||||
|
* Update all NO_DEFAULT_PATH usage in Modules/Find*
|
||||||
|
* Fix for cpack self extracting .sh files to work with more shells
|
||||||
|
* FindQt4 now finds dependencies for some qt modules
|
||||||
|
* Give a message if rpath is changed during install
|
||||||
|
* rpath changer during install understands symlinks now
|
||||||
|
* FindQt4 - make Qt not found if the QtCore library can't be found.
|
||||||
|
* UseQt4 - only add flags for modles that are used
|
||||||
|
* Fix incorrect extension extraction in gcc cross compiler check
|
||||||
|
* Add a way to modify depend scanning with the property:
|
||||||
|
IMPLICIT_DEPENDS_INCLUDE_TRANSFORM
|
||||||
|
* Fix -Wno-dev to not eat path to source tree
|
||||||
|
* Fix FindBoost version variable names to correct bug in Boost version
|
||||||
|
* Fix bug 0006990 CMake crashes with bad input to
|
||||||
|
set_source_files_properties
|
||||||
|
* Fix bug in FindCurses where you could not run cmake twice
|
||||||
* Thu Jun 12 2008 mrdocs@opensuse.org
|
* Thu Jun 12 2008 mrdocs@opensuse.org
|
||||||
- add %%ifdefs to disable the cmake gui for non-Suse distros
|
- add %%ifdefs to disable the cmake gui for non-Suse distros
|
||||||
- SLES 9 does not build, but its a compile failure
|
- SLES 9 does not build, but its a compile failure
|
||||||
|
Loading…
Reference in New Issue
Block a user