Djam/cmake
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/cmake.git synced 2025-02-24 07:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New version 3.6.1

Browse source
This commit is contained in:
Andrey Bondrov 2016-08-26 17:54:44 +10:00
parent f1fad7ade7
commit 47210015d8
4 changed files with 11 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
cmake-3.5.2.tar.gz: 5d6c68c3007d61cadd6257c170e60aa67154cda1
cmake-3.6.1.tar.gz: a37785b3f256a31ee21a047569bc74a8f57067bb

24
0001-Fix-FLTK-Find-path.patch
View file

@ -1,24 +0,0 @@
From bfd04106187a46bdb386d9d189259c7b492f31fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust.kde@free.fr>
Date: Sat, 27 Oct 2012 02:06:21 +0200
Subject: [PATCH 1/3] Fix FLTK Find path
---
Modules/FindFLTK.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index 0611cf0..fbb1183 100644
--- a/Modules/FindFLTK.cmake
+++ b/Modules/FindFLTK.cmake
@@ -101,6 +101,7 @@ if(NOT FLTK_DIR)
PATHS
# Look in standard UNIX install locations.
+ /usr/lib/FLTK-1.1
/usr/local/lib/fltk
/usr/lib/fltk
/usr/local/fltk
--
1.8.0

14
cmake-3.4.1-optflags.patch → cmake-3.6.1-optflags.patch
View file

@ -1,6 +1,6 @@
diff -urN cmake-3.4.1/Modules/Compiler/GNU.cmake cmake-3.4.1-patched/Modules/Compiler/GNU.cmake
--- cmake-3.4.1/Modules/Compiler/GNU.cmake 2015-12-03 01:43:21.000000000 +1000
+++ cmake-3.4.1-patched/Modules/Compiler/GNU.cmake 2015-12-24 01:29:17.813600279 +1000
diff -urN cmake-3.6.1/Modules/Compiler/GNU.cmake cmake-3.6.1-patched/Modules/Compiler/GNU.cmake
--- cmake-3.6.1/Modules/Compiler/GNU.cmake 2016-07-22 23:50:22.000000000 +1000
+++ cmake-3.6.1-patched/Modules/Compiler/GNU.cmake 2016-08-26 17:43:28.468035438 +1000
@@ -46,10 +46,10 @@
# Initial configuration flags.
@ -14,10 +14,10 @@ diff -urN cmake-3.4.1/Modules/Compiler/GNU.cmake cmake-3.4.1-patched/Modules/Com
+ set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-DNDEBUG")
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
if(NOT APPLE)
diff -urN cmake-3.4.1/Modules/Compiler/GNU-Fortran.cmake cmake-3.4.1-patched/Modules/Compiler/GNU-Fortran.cmake
--- cmake-3.4.1/Modules/Compiler/GNU-Fortran.cmake 2015-12-03 01:43:21.000000000 +1000
+++ cmake-3.4.1-patched/Modules/Compiler/GNU-Fortran.cmake 2015-12-24 01:28:30.882598143 +1000
if(NOT APPLE OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4) # work around #4462
diff -urN cmake-3.6.1/Modules/Compiler/GNU-Fortran.cmake cmake-3.6.1-patched/Modules/Compiler/GNU-Fortran.cmake
--- cmake-3.6.1/Modules/Compiler/GNU-Fortran.cmake 2016-07-22 23:50:22.000000000 +1000
+++ cmake-3.6.1-patched/Modules/Compiler/GNU-Fortran.cmake 2016-08-26 17:43:28.468035438 +1000
@@ -6,7 +6,7 @@
# No -DNDEBUG for Fortran.

8
cmake.spec
View file

@ -1,10 +1,10 @@
%define shortVersion %(echo %{version} | cut -d. -f1,2)
%bcond_with bootstrap
%bcond_with bootstrap
Summary: Cross-platform, open-source make system
Name: cmake
Version: 3.5.2
Version: 3.6.1
Release: 1
Epoch: 1
License: BSD
@ -12,9 +12,7 @@ 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-3.4.1-optflags.patch
# fix ftlk detection
Patch1: 0001-Fix-FLTK-Find-path.patch
Patch0: cmake-3.6.1-optflags.patch
Patch2: 0003-Disable-Test198.patch
BuildRequires: gcc-gfortran
BuildRequires: bzip2-devel