mirror of
https://abf.rosa.ru/djam/cmake.git
synced 2025-02-23 23:02:51 +00:00
New version 3.0.0, update files
This commit is contained in:
Andrey Bondrov
parent
61ff1580da
commit
e2d77eaf86
4 changed files with 17 additions and 87 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
cmake-2.8.11.2.tar.gz: 31f217c9305add433e77eff49a6eac0047b9e929
|
||||
cmake-3.0.0.tar.gz: 4dfd9ee9b829c77175d655f22322f14747f11ad2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- cmake-2.8.10.2/Modules/FindImageMagick.cmake.bero 2013-05-16 18:31:33.919975164 +0200
|
||||
+++ cmake-2.8.10.2/Modules/FindImageMagick.cmake 2013-05-16 18:40:19.856400054 +0200
|
||||
--- cmake-2.8.12/Modules/FindImageMagick.cmake.0006~ 2013-12-27 01:31:37.077298974 +0100
|
||||
+++ cmake-2.8.12/Modules/FindImageMagick.cmake 2013-12-27 01:40:28.700639284 +0100
|
||||
@@ -73,12 +73,16 @@
|
||||
# Helper functions
|
||||
#---------------------------------------------------------------------
|
||||
|
|
@ -16,4 +16,4 @@
|
|||
+ ${PC_ImageMagick_${component}_INCLUDE_DIRS}
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
|
||||
PATH_SUFFIXES
|
||||
ImageMagick
|
||||
ImageMagick ImageMagick-6
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
diff -urN cmake-2.8.11.2/Modules/FindFreetype.cmake cmake-2.8.11.2-patched/Modules/FindFreetype.cmake
|
||||
--- cmake-2.8.11.2/Modules/FindFreetype.cmake 2013-07-03 00:41:39.000000000 +1100
|
||||
+++ cmake-2.8.11.2-patched/Modules/FindFreetype.cmake 2014-06-03 21:04:58.520471128 +1100
|
||||
@@ -1,16 +1,25 @@
|
||||
-# - Locate FreeType library
|
||||
+#.rst:
|
||||
+# FindFreetype
|
||||
+# ------------
|
||||
+#
|
||||
+# Locate FreeType library
|
||||
+#
|
||||
# This module defines
|
||||
-# FREETYPE_LIBRARIES, the library to link against
|
||||
-# FREETYPE_FOUND, if false, do not try to link to FREETYPE
|
||||
-# FREETYPE_INCLUDE_DIRS, where to find headers.
|
||||
-# FREETYPE_VERSION_STRING, the version of freetype found (since CMake 2.8.8)
|
||||
-# This is the concatenation of the paths:
|
||||
-# FREETYPE_INCLUDE_DIR_ft2build
|
||||
-# FREETYPE_INCLUDE_DIR_freetype2
|
||||
-#
|
||||
-# $FREETYPE_DIR is an environment variable that would
|
||||
-# correspond to the ./configure --prefix=$FREETYPE_DIR
|
||||
-# used in building FREETYPE.
|
||||
+#
|
||||
+# ::
|
||||
+#
|
||||
+# FREETYPE_LIBRARIES, the library to link against
|
||||
+# FREETYPE_FOUND, if false, do not try to link to FREETYPE
|
||||
+# FREETYPE_INCLUDE_DIRS, where to find headers.
|
||||
+# FREETYPE_VERSION_STRING, the version of freetype found (since CMake 2.8.8)
|
||||
+# This is the concatenation of the paths:
|
||||
+# FREETYPE_INCLUDE_DIR_ft2build
|
||||
+# FREETYPE_INCLUDE_DIR_freetype2
|
||||
+#
|
||||
+#
|
||||
+#
|
||||
+# $FREETYPE_DIR is an environment variable that would correspond to the
|
||||
+# ./configure --prefix=$FREETYPE_DIR used in building FREETYPE.
|
||||
|
||||
#=============================================================================
|
||||
# Copyright 2007-2009 Kitware, Inc.
|
||||
@@ -53,7 +62,10 @@
|
||||
PATH_SUFFIXES include/freetype2 include
|
||||
)
|
||||
|
||||
-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
|
||||
+find_path(FREETYPE_INCLUDE_DIR_freetype2
|
||||
+ NAMES
|
||||
+ freetype/config/ftheader.h
|
||||
+ config/ftheader.h
|
||||
HINTS
|
||||
ENV FREETYPE_DIR
|
||||
PATHS
|
||||
@@ -79,11 +91,18 @@
|
||||
# set the user variables
|
||||
if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
|
||||
set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
|
||||
+ list(REMOVE_DUPLICATES FREETYPE_INCLUDE_DIRS)
|
||||
endif()
|
||||
set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
|
||||
|
||||
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
||||
- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
|
||||
+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
||||
+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
||||
+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
|
||||
+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
|
||||
+endif()
|
||||
+
|
||||
+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
|
||||
+ file(STRINGS "${FREETYPE_H}" freetype_version_str
|
||||
REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
|
||||
|
||||
unset(FREETYPE_VERSION_STRING)
|
||||
22
cmake.spec
22
cmake.spec
|
|
@ -4,15 +4,14 @@
|
|||
|
||||
Summary: Cross-platform, open-source make system
|
||||
Name: cmake
|
||||
Version: 2.8.11.2
|
||||
Release: 3
|
||||
Version: 3.0.0
|
||||
Release: 1
|
||||
Epoch: 1
|
||||
License: BSD
|
||||
Group: Development/Other
|
||||
Url: http://www.cmake.org/HTML/index.html
|
||||
Source0: http://www.cmake.org/files/v%{shortVersion}/%{name}-%{version}.tar.gz
|
||||
Source1: cmake.macros
|
||||
Patch0: cmake-2.8.11.2-freetype-2.5.patch
|
||||
# fix ftlk detection
|
||||
Patch1: 0001-Fix-FLTK-Find-path.patch
|
||||
Patch3: 0003-Disable-Test198.patch
|
||||
|
|
@ -46,14 +45,13 @@ generation, and template instantiation.
|
|||
%{_bindir}/ccmake
|
||||
%{_bindir}/ctest
|
||||
%{_bindir}/cpack
|
||||
%{_mandir}/man1/*
|
||||
%{_datadir}/%{name}
|
||||
%{_sysconfdir}/emacs/site-start.d/%{name}.el
|
||||
%{_sysconfdir}/rpm/macros.d/*
|
||||
%{_datadir}/emacs/site-lisp/cmake-mode.el
|
||||
%{_datadir}/vim/*/*
|
||||
%{_datadir}/aclocal/cmake.m4
|
||||
%doc CMakeLogo.gif Example mydocs/*
|
||||
%doc CMakeLogo.gif mydocs/*
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -112,8 +110,8 @@ cd build
|
|||
%makeinstall_std -C build
|
||||
|
||||
# cmake mode for emacs
|
||||
install -m644 Docs/cmake-mode.el -D %{buildroot}%{_datadir}/emacs/site-lisp/cmake-mode.el
|
||||
install -d %{buildroot}%{_sysconfdir}/emacs/site-start.d
|
||||
mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp %{buildroot}%{_sysconfdir}/emacs/site-start.d
|
||||
mv %{buildroot}%{_datadir}/cmake/editors/emacs/cmake-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/cmake-mode.el
|
||||
cat <<EOF >%{buildroot}%{_sysconfdir}/emacs/site-start.d/%{name}.el
|
||||
(setq load-path (cons (expand-file-name "/dir/with/cmake-mode") load-path))
|
||||
(require 'cmake-mode)
|
||||
|
|
@ -124,8 +122,14 @@ cat <<EOF >%{buildroot}%{_sysconfdir}/emacs/site-start.d/%{name}.el
|
|||
EOF
|
||||
|
||||
# cmake mode for vim
|
||||
install -m644 Docs/cmake-syntax.vim -D %{buildroot}%{_datadir}/vim/syntax/cmake.vim
|
||||
install -m644 Docs/cmake-indent.vim -D %{buildroot}%{_datadir}/vim/indent/cmake.vim
|
||||
mkdir -p %{buildroot}%{_datadir}/vim/syntax %{buildroot}%{_datadir}/vim/indent %{buildroot}%{_datadir}/vim/plugin
|
||||
mv %{buildroot}%{_datadir}/cmake/editors/vim/cmake-syntax.vim %{buildroot}%{_datadir}/vim/syntax/cmake.vim
|
||||
mv %{buildroot}%{_datadir}/cmake/editors/vim/cmake-indent.vim %{buildroot}%{_datadir}/vim/indent/cmake.vim
|
||||
mv %{buildroot}%{_datadir}/cmake/editors/vim/cmake-help.vim %{buildroot}%{_datadir}/vim/plugin/cmake-help.vim
|
||||
|
||||
# remove directory we just cleared by moving files where editors
|
||||
# will actually find them
|
||||
rm -rf %{buildroot}%{_datadir}/cmake/editors
|
||||
|
||||
# RPM macros
|
||||
install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.d/cmake.macros
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue