From e2b9bd5b805d410f18d63b5ddac6dae315e24ff5 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sat, 16 May 2015 23:19:40 -0400 Subject: [PATCH] ThirdParty: cmake 3.2.2 --- ThirdParty/AllMake.stage1 | 8 +- ThirdParty/rpmBuild/SPECS/cmake-3.2.2.spec | 166 +++++++++++++++++++++ etc/bashrc | 2 +- etc/prefs.csh-EXAMPLE | 2 +- etc/prefs.sh-EXAMPLE | 2 +- etc/settings.csh | 4 +- etc/settings.sh | 4 +- 7 files changed, 177 insertions(+), 11 deletions(-) create mode 100644 ThirdParty/rpmBuild/SPECS/cmake-3.2.2.spec diff --git a/ThirdParty/AllMake.stage1 b/ThirdParty/AllMake.stage1 index 46dd4bd4d..a994097d0 100755 --- a/ThirdParty/AllMake.stage1 +++ b/ThirdParty/AllMake.stage1 @@ -148,11 +148,11 @@ echo ( rpm_make -p cmake-2.8.12 -s cmake-2.8.12.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz ) } -# cmake 3.1.1 +# cmake 3.2.2 # -[ ! -z "$WM_THIRD_PARTY_USE_CMAKE_311" ] && { - echo "Building cmake 3.1.1" - ( rpm_make -p cmake-3.1.1 -s cmake-3.1.1.spec -u http://www.cmake.org/files/v3.1/cmake-3.1.1.tar.gz ) +[ ! -z "$WM_THIRD_PARTY_USE_CMAKE_322" ] && { + echo "Building cmake 3.2.2" + ( rpm_make -p cmake-3.2.2 -s cmake-3.2.2.spec -u http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz ) } echo ======================================== diff --git a/ThirdParty/rpmBuild/SPECS/cmake-3.2.2.spec b/ThirdParty/rpmBuild/SPECS/cmake-3.2.2.spec new file mode 100644 index 000000000..5ef77f624 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/cmake-3.2.2.spec @@ -0,0 +1,166 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with foam-extend. If not, see . +# +# Script +# RPM spec file for cmake-3.2.2 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2015) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name cmake +%define release %{_WM_OPTIONS} +%define version 3.2.2 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: cmake +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: http://www.cmake.org/files/v3.2/ +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + +%ifos darwin + # For Mac OSX: + # The configuration of cmake will be using the environment variable MACOSX_DEPLOYMENT_TARGET. + # This variable was initialized using 'sw_vers -productVersion' in etc/bashrc. + # We need to get rid of the revision number from this string. eg turn "10.7.5" into "10.7" + v=( ${MACOSX_DEPLOYMENT_TARGET//./ } ) + export MACOSX_DEPLOYMENT_TARGET="${v[0]}.${v[1]}" + echo "Resetting MACOSX_DEPLOYMENT_TARGET to ${MACOSX_DEPLOYMENT_TARGET}" + + # Recent version of Mac OSX (Yosemite) cannot compile cmake when gcc is the compiler + # Using clang instead + CC=clang + CXX=clang++ + +%endif + + ./configure \ + --prefix=%{_installPrefix} + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export CMAKE_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +export CMAKE_BIN_DIR=\$CMAKE_DIR/bin + +# Enable access to the runtime package applications +[ -d \$CMAKE_BIN_DIR ] && _foamAddPath \$CMAKE_BIN_DIR +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv CMAKE_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +setenv CMAKE_BIN_DIR \$CMAKE_DIR/bin + +if ( -e \$CMAKE_BIN_DIR ) then + _foamAddPath \$CMAKE_BIN_DIR +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} + diff --git a/etc/bashrc b/etc/bashrc index bf37294c6..fa2a19a7b 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -84,7 +84,7 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty # This can be overriden in prefs.sh # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # For AllMake.stage1 -export WM_THIRD_PARTY_USE_CMAKE_2812=1 +export WM_THIRD_PARTY_USE_CMAKE_322=1 # # For AllMake.stage2 diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index be8ba6bb8..b62ae137a 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -191,7 +191,7 @@ #setenv WM_THIRD_PARTY_USE_M4_146 1 #setenv WM_THIRD_PARTY_USE_BISON_27 1 #setenv WM_THIRD_PARTY_USE_FLEX_2535 1 -setenv WM_THIRD_PARTY_USE_CMAKE_2812 1 +setenv WM_THIRD_PARTY_USE_CMAKE_322 1 # # For AllMake.stage2 diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index 0996482e8..3393e347a 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -201,7 +201,7 @@ export FOAM_VERBOSE=1 #export WM_THIRD_PARTY_USE_M4_146=1 #export WM_THIRD_PARTY_USE_BISON_27=1 #export WM_THIRD_PARTY_USE_FLEX_2535=1 -export WM_THIRD_PARTY_USE_CMAKE_2812=1 +export WM_THIRD_PARTY_USE_CMAKE_322=1 # # For AllMake.stage2 diff --git a/etc/settings.csh b/etc/settings.csh index 7047dceb3..4ca054d20 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -499,8 +499,8 @@ if ( $?CMAKE_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_CMAKE_2812 != 0 && -e "$WM_THIR _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.12/platforms/$WM_OPTIONS/etc/cmake-2.8.12.csh endif -if ( $?CMAKE_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_CMAKE_311 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/cmake-3.1.1/platforms/$WM_OPTIONS ) then - _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-3.1.1/platforms/$WM_OPTIONS/etc/cmake-3.1.1.csh +if ( $?CMAKE_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_CMAKE_311 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/cmake-3.2.2/platforms/$WM_OPTIONS ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-3.2.2/platforms/$WM_OPTIONS/etc/cmake-3.2.2.csh endif # m4 diff --git a/etc/settings.sh b/etc/settings.sh index bb3dd63ca..8a878467d 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -607,8 +607,8 @@ export MPI_BUFFER_SIZE [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " CMAKE_DIR is initialized to: $CMAKE_DIR" -[ -z "$CMAKE_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_CMAKE_311 ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-3.1.1/platforms/$WM_OPTIONS ] && { - _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-3.1.1/platforms/$WM_OPTIONS/etc/cmake-3.1.1.sh +[ -z "$CMAKE_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_CMAKE_311 ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-3.2.2/platforms/$WM_OPTIONS ] && { + _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-3.2.2/platforms/$WM_OPTIONS/etc/cmake-3.2.2.sh } [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " CMAKE_DIR is initialized to: $CMAKE_DIR"