forked from pool/cmake
This commit is contained in:
parent
b19ac65357
commit
4a9bf3bc18
@ -1,12 +0,0 @@
|
||||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -128,6 +128,7 @@ ELSE(CMAKE_ALLOW_SYSTEM_LIBRARIES)
|
||||
SET(CMAKE_USE_SYSTEM_XMLRPC 0)
|
||||
SET(CMAKE_USE_SYSTEM_ZLIB 0)
|
||||
ENDIF(CMAKE_ALLOW_SYSTEM_LIBRARIES)
|
||||
+SET(CMAKE_USE_SYSTEM_XMLRPC 0)
|
||||
|
||||
# Inform utility library header wrappers whether to use system versions.
|
||||
CONFIGURE_FILE(${CMake_SOURCE_DIR}/Utilities/cmThirdParty.h.in
|
@ -1,12 +0,0 @@
|
||||
--- Modules/FindPythonLibs.cmake
|
||||
+++ Modules/FindPythonLibs.cmake
|
||||
@@ -62,9 +62,6 @@
|
||||
python2.0/config
|
||||
python1.6/config
|
||||
python1.5/config
|
||||
-
|
||||
- # Avoid finding the .dll in the PATH. We want the .lib.
|
||||
- NO_SYSTEM_ENVIRONMENT_PATH
|
||||
)
|
||||
|
||||
# Search for the python framework on Apple.
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:466fbdad480a30c97600045cce851a326bf778ee9f70be99e21988baad6bb5cb
|
||||
size 1944570
|
11
cmake-2.6.0-use_intree_xmlrpc.patch
Normal file
11
cmake-2.6.0-use_intree_xmlrpc.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -55,6 +55,8 @@ MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES)
|
||||
CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_ZLIB "Use system-installed zlib"
|
||||
${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CMAKE_USE_SYSTEM_CURL" ON)
|
||||
|
||||
+ SET(CMAKE_USE_SYSTEM_XMLRPC 0 CACHE BOOL "Use system-installed xmlrpc" FORCE)
|
||||
+
|
||||
# There is currently no option for system tar because the upstream
|
||||
# libtar does not have our modifications to allow reentrant
|
||||
# object-oriented use of the library.
|
11
cmake-2.6.0-use_shared_python_lib.patch
Normal file
11
cmake-2.6.0-use_shared_python_lib.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- Modules/FindPythonLibs.cmake
|
||||
+++ Modules/FindPythonLibs.cmake
|
||||
@@ -29,8 +29,6 @@ FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
|
||||
PATH_SUFFIXES
|
||||
python${_CURRENT_VERSION}/config
|
||||
- # Avoid finding the .dll in the PATH. We want the .lib.
|
||||
- NO_SYSTEM_ENVIRONMENT_PATH
|
||||
)
|
||||
|
||||
SET(PYTHON_FRAMEWORK_INCLUDES)
|
3
cmake-2.6.0.tar.bz2
Normal file
3
cmake-2.6.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ab80352491c5544ebc40bff029aa556092b2fe27f214a9a6be295dc46c9ad1d
|
||||
size 2651730
|
11
cmake-disable-builtin-chrpath.diff
Normal file
11
cmake-disable-builtin-chrpath.diff
Normal file
@ -0,0 +1,11 @@
|
||||
--- Source/cmTarget.cxx
|
||||
+++ Source/cmTarget.cxx
|
||||
@@ -3105,7 +3105,7 @@ bool cmTarget::IsChrpathUsed()
|
||||
}
|
||||
|
||||
// Allow the user to disable builtin chrpath explicitly.
|
||||
- if(this->Makefile->IsOn("CMAKE_NO_BUILTIN_CHRPATH"))
|
||||
+ if(1 || this->Makefile->IsOn("CMAKE_NO_BUILTIN_CHRPATH"))
|
||||
{
|
||||
return false;
|
||||
}
|
@ -1,3 +1,88 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 6 22:48:24 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 2.6.0:
|
||||
* Fix links in generated documentation
|
||||
* Fix for FindQt and some mac frameworks
|
||||
* Fix for ctest to report more than 2 gigs system memory on windows
|
||||
* Fix CTest build name for vs 9, and fix memory size on windows
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 3 00:32:24 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 2.6.0 RC10:
|
||||
- Do not duplicate .so libraries on the link line
|
||||
- Add more system library paths to sun builds
|
||||
- Add BETA support for Intel Fortran IDE files in visual studio
|
||||
- Fix FindCurses to work if ncurses is the only option
|
||||
- Fix shell escapes on some systems
|
||||
- Remove check for file write as input to cmake, as it is no longer needed
|
||||
- Make check_type_size automatically check for headers that it uses
|
||||
- Remove minimum required from FindBoost.cmake
|
||||
- Fix FindSDL so that it can be run more than once
|
||||
- Fix find required for VTK package
|
||||
- Allow for CMAKE_OSX_SYSROOT to work with single architecture
|
||||
- Add context information when a source file cannot be found.
|
||||
- Report the directory-level context even if no list file
|
||||
is currently being processed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 28 22:26:16 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- fix curses detection (readds previously lost ccmake)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 24 22:10:44 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 2.6.0 RC9:
|
||||
- Fix for fortran mod:: support
|
||||
- Fix bug in install command with BUNDLE DESTINATION
|
||||
- Make mac install symlinks check for errors
|
||||
- Fix for CMP0007, to not warn about empty lists
|
||||
- Preserve static libraries when linked multiple times
|
||||
- Use c compiler path to find asm compiler
|
||||
- Allow RC compiler to not get all COMPILE_FLAGS
|
||||
- Complete overhaul for FindBoost.cmake
|
||||
- Minor fixes for FindMPI.cmake
|
||||
- Fix for list command and empty list elements CMP0007
|
||||
- Fix for VS6 and sub-groups
|
||||
- Fix bug 6440, and make sure _INIT flags do not overright cache values
|
||||
- Do not report CMP0003 for anything other than -l
|
||||
- Fix crash in fortran depend scanning, bug 6855
|
||||
- Fix timeout values for cmake's own tests
|
||||
- Better message in compiler ABI detect
|
||||
- Fixes for cpack x11 packages on leopard
|
||||
- Changes to cpack options names
|
||||
- Fixes for FindMPI on 64 bit MS MPI
|
||||
- Fix for -isystem for wxWidgets
|
||||
- Some fixes for chrpath during installation
|
||||
- Fix compatibility with CMake 2.4 for installation of MACOSX_BUNDLE (CMP0006)
|
||||
- Do not use debug postfix when building frameworks on the Mac
|
||||
- Fix exception handling off/on issue with visual studio IDE generators
|
||||
- Fix <OBJECT_DIR> to be native path style
|
||||
- Fix leak in cpack
|
||||
- Some Qt GUI style changes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 19 14:53:51 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- fix python lib detection again
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 15 00:50:16 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 2.6.0 RC8:
|
||||
* Fix sun make very poor performance
|
||||
* Fix includes for automoc in FindQt4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 9 20:19:08 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 2.6.0 RC6:
|
||||
* last RC before 2.6.0
|
||||
* new graphical cmake ui
|
||||
* faster install
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 29 12:05:38 CET 2008 - adrian@suse.de
|
||||
|
||||
|
127
cmake.spec
127
cmake.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package cmake (Version 2.4.8)
|
||||
# spec file for package cmake (Version 2.6.0)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
|
||||
Name: cmake
|
||||
Version: 2.4.8
|
||||
Release: 12
|
||||
Version: 2.6.0
|
||||
Release: 7
|
||||
License: BSD 3-Clause
|
||||
Group: Development/Tools/Building
|
||||
%define tar_version 2.4.8
|
||||
%define tar_version 2.6.0
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version}
|
||||
%if %suse_version > 1020
|
||||
@ -27,13 +27,14 @@ BuildRequires: expat
|
||||
%else
|
||||
BuildRequires: expat-devel
|
||||
%endif
|
||||
BuildRequires: curl-devel expat gcc-c++ libstdc++-devel
|
||||
BuildRequires: ncurses-devel openssl-devel zlib-devel
|
||||
BuildRequires: curl-devel expat gcc-c++ ncurses-devel openssl-devel
|
||||
BuildRequires: libqt4-devel update-desktop-files zlib-devel
|
||||
Url: http://www.cmake.org/
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Patch0: cmake-2.4.7-use_intree_xmlrpc.patch
|
||||
Source0: %{name}-%{tar_version}.tar.bz2
|
||||
Patch0: cmake-2.6.0-use_intree_xmlrpc.patch
|
||||
Patch1: cmake-2.4.7-less_verbosity.patch
|
||||
Patch2: cmake-2.4.7-use_shared_python_lib.patch
|
||||
Patch2: cmake-2.6.0-use_shared_python_lib.patch
|
||||
Patch4: cmake-disable-builtin-chrpath.diff
|
||||
Summary: Cross-platform, open-source make system
|
||||
Requires: make
|
||||
|
||||
@ -42,6 +43,21 @@ CMake is a cross-platform, open-source make system
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Kitware, Inc., Insight Consortium
|
||||
|
||||
%package gui
|
||||
License: BSD 3-Clause
|
||||
Summary: CMake Graphical User Interface
|
||||
Group: Development/Tools/Building
|
||||
|
||||
%description gui
|
||||
This is a Graphical User Interface for CMake, a cross-platform,
|
||||
open-source make system.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Kitware, Inc., Insight Consortium
|
||||
@ -52,6 +68,7 @@ Authors:
|
||||
#disabled because it breaks progress information
|
||||
#%patch1
|
||||
%patch2
|
||||
%patch4
|
||||
|
||||
%build
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||
@ -61,12 +78,17 @@ export CFLAGS="$CXXFLAGS"
|
||||
--datadir=/share/%{name} \
|
||||
--docdir=/share/doc/packages/%{name} \
|
||||
--mandir=/share/man \
|
||||
--system-libs
|
||||
--system-libs \
|
||||
--parallel=0%jobs \
|
||||
--qt-gui
|
||||
make VERBOSE=1 %{?jobs:-j %jobs}
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install
|
||||
find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644
|
||||
%if 0%suse_version
|
||||
%suse_update_desktop_file CMake Development IDE Tools Qt
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
@ -74,16 +96,93 @@ rm -rf %{buildroot}
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/usr/bin/cpack
|
||||
/usr/bin/ccmake
|
||||
/usr/bin/cmake
|
||||
/usr/bin/ctest
|
||||
/usr/bin/ccmake
|
||||
/usr/share/cmake
|
||||
%doc /usr/share/doc/packages/%name
|
||||
%_mandir/man1/ccmake.1.*
|
||||
%_mandir/man1/cmake.1.*
|
||||
%_mandir/man1/ctest.1.*
|
||||
%doc %_mandir/man1/cmake.1.*
|
||||
%doc %_mandir/man1/ctest.1.*
|
||||
%doc %_mandir/man1/ccmake.1.*
|
||||
%doc %_mandir/man1/cmakecommands.1.*
|
||||
%doc %_mandir/man1/cmakecompat.1.*
|
||||
%doc %_mandir/man1/cmakemodules.1.*
|
||||
%doc %_mandir/man1/cmakeprops.1.*
|
||||
%doc %_mandir/man1/cmakevars.1.*
|
||||
%doc %_mandir/man1/cpack.1.*
|
||||
|
||||
%files gui
|
||||
%defattr(-,root,root)
|
||||
/usr/bin/cmake-gui
|
||||
/usr/share/applications/CMake.desktop
|
||||
/usr/share/mime/packages/cmakecache.xml
|
||||
/usr/share/pixmaps/CMakeSetup.png
|
||||
|
||||
%changelog
|
||||
* Wed May 07 2008 dmueller@suse.de
|
||||
- update to 2.6.0:
|
||||
* Fix links in generated documentation
|
||||
* Fix for FindQt and some mac frameworks
|
||||
* Fix for ctest to report more than 2 gigs system memory on windows
|
||||
* Fix CTest build name for vs 9, and fix memory size on windows
|
||||
* Sat May 03 2008 dmueller@suse.de
|
||||
- update to 2.6.0 RC10:
|
||||
- Do not duplicate .so libraries on the link line
|
||||
- Add more system library paths to sun builds
|
||||
- Add BETA support for Intel Fortran IDE files in visual studio
|
||||
- Fix FindCurses to work if ncurses is the only option
|
||||
- Fix shell escapes on some systems
|
||||
- Remove check for file write as input to cmake, as it is no longer needed
|
||||
- Make check_type_size automatically check for headers that it uses
|
||||
- Remove minimum required from FindBoost.cmake
|
||||
- Fix FindSDL so that it can be run more than once
|
||||
- Fix find required for VTK package
|
||||
- Allow for CMAKE_OSX_SYSROOT to work with single architecture
|
||||
- Add context information when a source file cannot be found.
|
||||
- Report the directory-level context even if no list file
|
||||
is currently being processed.
|
||||
* Tue Apr 29 2008 dmueller@suse.de
|
||||
- fix curses detection (readds previously lost ccmake)
|
||||
* Fri Apr 25 2008 dmueller@suse.de
|
||||
- update to 2.6.0 RC9:
|
||||
- Fix for fortran mod:: support
|
||||
- Fix bug in install command with BUNDLE DESTINATION
|
||||
- Make mac install symlinks check for errors
|
||||
- Fix for CMP0007, to not warn about empty lists
|
||||
- Preserve static libraries when linked multiple times
|
||||
- Use c compiler path to find asm compiler
|
||||
- Allow RC compiler to not get all COMPILE_FLAGS
|
||||
- Complete overhaul for FindBoost.cmake
|
||||
- Minor fixes for FindMPI.cmake
|
||||
- Fix for list command and empty list elements CMP0007
|
||||
- Fix for VS6 and sub-groups
|
||||
- Fix bug 6440, and make sure _INIT flags do not overright cache values
|
||||
- Do not report CMP0003 for anything other than -l
|
||||
- Fix crash in fortran depend scanning, bug 6855
|
||||
- Fix timeout values for cmake's own tests
|
||||
- Better message in compiler ABI detect
|
||||
- Fixes for cpack x11 packages on leopard
|
||||
- Changes to cpack options names
|
||||
- Fixes for FindMPI on 64 bit MS MPI
|
||||
- Fix for -isystem for wxWidgets
|
||||
- Some fixes for chrpath during installation
|
||||
- Fix compatibility with CMake 2.4 for installation of MACOSX_BUNDLE (CMP0006)
|
||||
- Do not use debug postfix when building frameworks on the Mac
|
||||
- Fix exception handling off/on issue with visual studio IDE generators
|
||||
- Fix <OBJECT_DIR> to be native path style
|
||||
- Fix leak in cpack
|
||||
- Some Qt GUI style changes
|
||||
* Sat Apr 19 2008 dmueller@suse.de
|
||||
- fix python lib detection again
|
||||
* Tue Apr 15 2008 dmueller@suse.de
|
||||
- update to 2.6.0 RC8:
|
||||
* Fix sun make very poor performance
|
||||
* Fix includes for automoc in FindQt4
|
||||
* Wed Apr 09 2008 dmueller@suse.de
|
||||
- update to 2.6.0 RC6:
|
||||
* last RC before 2.6.0
|
||||
* new graphical cmake ui
|
||||
* faster install
|
||||
* Fri Feb 29 2008 adrian@suse.de
|
||||
- use rpm macros for pathes
|
||||
- fix build for Mandriva
|
||||
|
Loading…
Reference in New Issue
Block a user