mirror of
https://develop.openfoam.com/Development/ThirdParty-common.git
synced 2025-12-08 06:57:50 +00:00
GIT: Merge in foundation/master with cleanup (2016-06-14)
The ThirdParty repository from the Foundation now includes some
3rd-party source code (paraview, scotch) as well.
To avoid this bloat (ca. 50MB), now and in the future, it is
unfortunately necessary to break the linear history and the direct
connection with the Foundation repository.
This commit is a squashed merge of the current Foundation master branch
with some minor adjustments.
Stop tracking of the derived README.html file.
===========================================================================
Changes prior to merge:
commit 3cb21d12be069561fbe13461440cbdf1c8b188d5
Author: mark <mark@opencfd>
Date: Tue Jun 14 17:18:40 2016 +0200
GIT: rationalize .gitignore
- do not track derived content.
- do track wmake files etc. (re-instates some content)
commit d1bf108bea922bf60a1002c4641770b91f09f226
Author: Henry Weller <http://cfd.direct>
Date: Sat Nov 7 21:44:27 2015 +0000
Reinstated Qt build scripts
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1905
commit 7302adf5d0a7bafe635c5d0470f00a6fe78a57f6
Author: mark <mark@opencfd>
Date: Tue Jun 14 17:15:27 2016 +0200
Revert "scotch_6.0.3: Added to the source tree to simplify building OpenFOAM"
This reverts commit 1cce60aa78540bf96783684523e1cac4b6a78043.
commit fbe0018d5fd4d5f94f00f8e7efd3ae11b6ab41b5
Author: mark <mark@opencfd>
Date: Tue Jun 14 17:15:03 2016 +0200
Revert "ParaView-5.0.1: Added the source-tree to ThirdParty-dev and patched as described in the README file"
This reverts commit eba760a6d6bb44860fc7d94d922be7215ee93c1f.
===========================================================================
All changes since NOV-2015 are included in the merge:
commit 17cafd35812493f9a39e56c7355f49c1d3eef2d0
Author: Henry Weller <http://cfd.direct>
Date: Thu Jun 9 14:36:59 2016 +0100
makeGcc, makeCGAL: lib -> lib64 on 64bit OSs
Patch contributed by Bruno Santos
Resolves patch request http://bugs.openfoam.org/view.php?id=2114
commit ce4951579b8e01ce524ed6e465ea352e6a243f1b
Author: Henry Weller <http://cfd.direct>
Date: Wed Jun 8 15:14:47 2016 +0100
ThirdParty-dev/makeGcc: added "-no-multilib" option
Patch contributed by Bruno Santos
Resolves patch request http://bugs.openfoam.org/view.php?id=2113
commit f72ad1f0a66338e5c342efed47079347e1db16d0
Author: Henry Weller <http://cfd.direct>
Date: Tue May 31 09:16:57 2016 +0100
README: Updated download instructions
commit eba760a6d6bb44860fc7d94d922be7215ee93c1f
Author: Henry Weller <http://cfd.direct>
Date: Mon May 30 21:20:56 2016 +0100
ParaView-5.0.1: Added the source-tree to ThirdParty-dev and patched as described in the README file
Resolves bug-report http://bugs.openfoam.org/view.php?id=2098
commit 1cce60aa78540bf96783684523e1cac4b6a78043
Author: Henry Weller <http://cfd.direct>
Date: Mon May 30 21:17:14 2016 +0100
scotch_6.0.3: Added to the source tree to simplify building OpenFOAM
Recent versions of scotch are rarely available in packaged form for
ready installation on GNU/Linux distributions and so the sources are
generally required.
commit 08df75f4c7339520880fcf9dd243e9c414cbfe7e
Author: Henry Weller <http://cfd.direct>
Date: Mon May 30 21:16:54 2016 +0100
.gitignore: Simplified
commit ef2d69ba55076ba14ab0c771ac2981b94ab60f2e
Author: Henry Weller <http://cfd.direct>
Date: Mon May 30 21:16:27 2016 +0100
README: Updated instructions for compiling ParaView-5.0.1
commit 7cdc8b196acfa021c4ff23036714aaee5e1b9612
Author: Henry Weller <http://cfd.direct>
Date: Mon May 30 12:30:17 2016 +0100
README: Upgraded to CGAL-4.8
commit bc8ce83166a05db0dc197a7a203634aa6d25c96f
Author: Henry Weller <http://cfd.direct>
Date: Mon May 30 12:28:27 2016 +0100
makeCGAL: Updated to CGAL-4.8
commit c0afdcde7920538ceaf9e0c78827e3a3f18f541d
Author: Henry Weller <http://cfd.direct>
Date: Mon May 23 18:46:27 2016 +0100
etc/tools/ParaViewFunctions: Improve instructions for updating the environment after compiling ParaView
commit b627924a4bf104521b567d3aa3dc80c864325b1a
Author: Henry Weller <http://cfd.direct>
Date: Tue May 10 11:38:00 2016 +0100
Allwmake: Added scripted changes for REALTYPEWIDTH and IDXTYPEWIDTH
Patch contributed by Bruno Santos
Resolves bug-report http://bugs.openfoam.org/view.php?id=2085
commit 69dba76b3195420c71173a65b1c227b2650eaebf
Author: Henry Weller <http://cfd.direct>
Date: Sun Apr 3 14:43:58 2016 +0100
Further changes for http://www.openfoam.org/mantisbt/view.php?id=2040
Patch provided by Bruno Santos
commit 1379e08a39ef9e199307e9b6608e7ad97ed03b77
Author: Henry Weller <http://cfd.direct>
Date: Sun Apr 3 10:30:43 2016 +0100
Allwmake: Implement the default "stop on 1st error"
Patch contributed by Bruno Santos
Resolves tweak http://www.openfoam.org/mantisbt/view.php?id=2040
commit 8c9c235db686de2612c62112b37e132bfa773b16
Author: Henry Weller <http://cfd.direct>
Date: Wed Mar 30 19:28:28 2016 +0100
Updated handling of the ParaView installation path
Patch contributed by Bruno Santos
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=2034
commit d88b4ea88db7d35c7b7fe8d869d59be32a224144
Author: Henry Weller <http://cfd.direct>
Date: Mon Mar 21 23:03:59 2016 +0000
makeCGAL: Corrected typo
Patch contributed by Bruno Santos
Resolves report http://www.openfoam.org/mantisbt/view.php?id=1215
commit 578f8827fbc5f709595fc5ab5185053aaa8cf678
Author: Henry Weller <http://cfd.direct>
Date: Mon Mar 14 11:13:23 2016 +0000
Make scripts updated to use the new OpenFOAM-dev/ets/config.sh variables
Contributed by Bruno Santos
Resolves patch request http://www.openfoam.org/mantisbt/view.php?id=1215
See also http://www.openfoam.org/mantisbt/view.php?id=1232
commit c8904e60d2c97ee3c4865bb34419758a10cb2a5a
Author: Henry Weller <http://cfd.direct>
Date: Tue Feb 16 08:57:29 2016 +0000
scripts: Reformat with consistent section separators
commit 43f2b369458ff87d0c85c493586d12b75855cf32
Author: Henry Weller <http://cfd.direct>
Date: Tue Feb 16 08:56:26 2016 +0000
ThirdParty-dev/etc/tools/ParaViewFunctions: Updated docs
Including patch from Bruno Santos
Resolves report http://www.openfoam.org/mantisbt/view.php?id=1997
commit dfe9e823de452f4c540aa4d02dcf5058e063dd44
Author: Henry Weller <http://cfd.direct>
Date: Wed Feb 10 20:44:32 2016 +0000
README.org: Upgrade OpenMPI link to openmpi-1.10.2
commit 99d158539e21a3a86d9ac9d5d6f67834142a1847
Author: Henry Weller <http://cfd.direct>
Date: Wed Feb 10 20:21:34 2016 +0000
Rename makeParaView4 makeParaView and update to support versions 4 and 5
Rename makeParaView makeParaView3 specifically for ParaView version 3
commit 8219a109a24d0699f689cf29a6ce6b4190dc84f0
Author: Henry Weller <http://cfd.direct>
Date: Wed Feb 10 16:21:23 2016 +0000
Updates for changes to etc/config structure
commit c6474e672655864b784950b3bc12e245745ea64d
Author: Henry Weller <http://cfd.direct>
Date: Sun Feb 7 10:30:22 2016 +0000
README: Added download link for ParaView-5.0.0
commit 2da4d8ccea67b4d194161f03c2aca8f693789121
Author: Henry Weller <http://cfd.direct>
Date: Sun Feb 7 10:27:46 2016 +0000
README: Updated for ParaView-5.0.0
commit 730b8840f7a47e4807c5c239caf337b49960fc9b
Author: Henry Weller <http://cfd.direct>
Date: Sun Feb 7 10:26:15 2016 +0000
makeGcc: Removed support for gcc versions older the 4.5
commit 2500c120b9cd29b5b46d4ca118a60dfac78a8923
Author: Henry Weller <http://cfd.direct>
Date: Mon Nov 2 20:00:59 2015 +0000
README.org: Added patch instructions for ParaView-4.4.0 from
http://www.openfoam.org/mantisbt/view.php?id=1887
===========================================================================
This commit is contained in:
mark
69
.gitignore
vendored
69
.gitignore
vendored
@ -1,79 +1,32 @@
|
||||
# man gitignore for more information
|
||||
|
||||
# editor and misc backup files - anywhere
|
||||
# Ignore editor and misc backup files - anywhere
|
||||
*~
|
||||
.*~
|
||||
*.bak
|
||||
*.bak[0-9][0-9]
|
||||
*.orig
|
||||
*.orig[0-9][0-9]
|
||||
\#*\#
|
||||
|
||||
# file-browser settings - anywhere
|
||||
.directory
|
||||
|
||||
# CVS recovered versions - anywhere
|
||||
.#*
|
||||
|
||||
# objects and archives - anywhere
|
||||
*.[oa]
|
||||
*.la
|
||||
*.so
|
||||
*.jar
|
||||
|
||||
# derived files
|
||||
lex.yy.c
|
||||
|
||||
# Corefiles
|
||||
core
|
||||
|
||||
# dependency files - anywhere
|
||||
*.dep
|
||||
|
||||
# lnInclude (symlink) folders - anywhere
|
||||
lnInclude
|
||||
|
||||
# build folders - anywhere
|
||||
linux*Gcc*/
|
||||
linux*Icc*/
|
||||
linuxming*/
|
||||
SiCortex*Gcc*/
|
||||
solaris*Gcc*/
|
||||
SunOS*Gcc*/
|
||||
|
||||
# source packages - anywhere
|
||||
# Ignore source packages - anywhere
|
||||
*.tar.bz2
|
||||
*.tar.gz
|
||||
*.tar
|
||||
*.tgz
|
||||
*.gtgz
|
||||
|
||||
# Ignore build and platforms folders
|
||||
build/
|
||||
platforms/
|
||||
|
||||
# ignore the persistent .build tag in the main directory
|
||||
/.build
|
||||
# Generated files in the main directory
|
||||
/*.html
|
||||
|
||||
# ignore .timeStamp in the main directory
|
||||
/.timeStamp
|
||||
|
||||
# ignore unpacked sources in the main directory (match pkg-ver)
|
||||
# Ignore unpacked sources in the main directory (match pkg-ver)
|
||||
# this also matches symlinks
|
||||
/*[-_][0-9]*
|
||||
|
||||
# ignore all sub-directories
|
||||
# Ignore all top-level sub-directories
|
||||
/*/
|
||||
|
||||
# do not ignore these ones
|
||||
# Do not ignore these ones though
|
||||
!/etc/
|
||||
|
||||
# do not ignore the first level of these ones
|
||||
!/malloc/
|
||||
/malloc/*/
|
||||
!/malloc/fbsdmalloc/
|
||||
|
||||
# ignore these extra symlinks
|
||||
libccmio
|
||||
|
||||
# track this patched version directly - until metis gets dropped
|
||||
!/metis-5.0pre2/libmetis/metislib.h
|
||||
|
||||
# end-of-file
|
||||
# End-of-file
|
||||
|
||||
2
Allclean
2
Allclean
@ -59,4 +59,4 @@ done
|
||||
[ -d platforms ] && ( set -x; rm -rf platforms/* )
|
||||
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
34
Allwmake
34
Allwmake
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -77,7 +77,7 @@ OPENMPI)
|
||||
set -x
|
||||
cd "${MPI_ARCH_PATH##*/}" || exit 1 # change to openmpi-VERSION
|
||||
|
||||
make distclean 2>/dev/null
|
||||
[ -e Makefile ] && make distclean 2>/dev/null
|
||||
rm -rf $MPI_ARCH_PATH
|
||||
|
||||
# start with GridEngine support,
|
||||
@ -122,7 +122,7 @@ MPICH)
|
||||
set -x
|
||||
cd $MPI_HOME || exit 1 # change to mpich-VERSION
|
||||
|
||||
make distclean 2>/dev/null
|
||||
[ -e Makefile ] && make distclean 2>/dev/null
|
||||
rm -rf $MPI_ARCH_PATH
|
||||
rm util/machines/machines.*
|
||||
|
||||
@ -173,12 +173,12 @@ esac
|
||||
|
||||
|
||||
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
|
||||
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh`
|
||||
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
|
||||
then
|
||||
. $settings
|
||||
else
|
||||
echo
|
||||
echo "Error: no config/scotch.sh settings"
|
||||
echo "Error: no config.sh/scotch settings"
|
||||
echo
|
||||
fi
|
||||
|
||||
@ -306,14 +306,14 @@ then
|
||||
fi
|
||||
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Metis is optional
|
||||
echo ========================================
|
||||
echo Build Metis decomposition
|
||||
|
||||
# get METIS_VERSION, METIS_ARCH_PATH
|
||||
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/metis.sh`
|
||||
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis`
|
||||
then
|
||||
. $settings
|
||||
fi
|
||||
@ -330,6 +330,24 @@ then
|
||||
(
|
||||
set -x
|
||||
cd $METIS_VERSION || exit 1
|
||||
|
||||
if [ "$WM_PRECISION_OPTION" = "DP" ]
|
||||
then
|
||||
FLOAT_PRECISION=64
|
||||
elif [ "$WM_PRECISION_OPTION" = "SP" ]
|
||||
then
|
||||
FLOAT_PRECISION=32
|
||||
else
|
||||
echo " Metis pre-configure error:"
|
||||
echo " WM_PRECISION_OPTION is neither DP nor SP"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Change user settings automatically
|
||||
sed -i -e 's=\(#define IDXTYPEWIDTH\).*=\1 '$WM_LABEL_SIZE'=' \
|
||||
-e 's=\(#define REALTYPEWIDTH\).*=\1 '$FLOAT_PRECISION'=' \
|
||||
include/metis.h
|
||||
|
||||
make config shared=1 prefix=$METIS_ARCH_PATH
|
||||
make -j $WM_NCOMPPROCS install
|
||||
cp $METIS_ARCH_PATH/lib/libmetis.so $FOAM_EXT_LIBBIN
|
||||
@ -365,4 +383,4 @@ echo ========================================
|
||||
echo
|
||||
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -26,7 +26,7 @@
|
||||
# AllwmakeLibccmio
|
||||
#
|
||||
# Description
|
||||
# Get and build CD-adapco's ccmio library
|
||||
# Build CD-adapco's ccmio library
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
packageDir=libccmio-2.6.1
|
||||
@ -82,4 +82,4 @@ set -x
|
||||
)
|
||||
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
335
README.html
335
README.html
@ -1,335 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
||||
<head>
|
||||
<title>OpenFOAM-3.0.x Third-Party packages</title>
|
||||
<!-- 2015-11-03 Tue 17:54 -->
|
||||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||
<meta name="generator" content="Org-mode" />
|
||||
<style type="text/css">
|
||||
<!--/*--><![CDATA[/*><!--*/
|
||||
.title { text-align: center; }
|
||||
.todo { font-family: monospace; color: red; }
|
||||
.done { color: green; }
|
||||
.tag { background-color: #eee; font-family: monospace;
|
||||
padding: 2px; font-size: 80%; font-weight: normal; }
|
||||
.timestamp { color: #bebebe; }
|
||||
.timestamp-kwd { color: #5f9ea0; }
|
||||
.right { margin-left: auto; margin-right: 0px; text-align: right; }
|
||||
.left { margin-left: 0px; margin-right: auto; text-align: left; }
|
||||
.center { margin-left: auto; margin-right: auto; text-align: center; }
|
||||
.underline { text-decoration: underline; }
|
||||
#postamble p, #preamble p { font-size: 90%; margin: .2em; }
|
||||
p.verse { margin-left: 3%; }
|
||||
pre {
|
||||
border: 1px solid #ccc;
|
||||
box-shadow: 3px 3px 3px #eee;
|
||||
padding: 8pt;
|
||||
font-family: monospace;
|
||||
overflow: auto;
|
||||
margin: 1.2em;
|
||||
}
|
||||
pre.src {
|
||||
position: relative;
|
||||
overflow: visible;
|
||||
padding-top: 1.2em;
|
||||
}
|
||||
pre.src:before {
|
||||
display: none;
|
||||
position: absolute;
|
||||
background-color: white;
|
||||
top: -10px;
|
||||
right: 10px;
|
||||
padding: 3px;
|
||||
border: 1px solid black;
|
||||
}
|
||||
pre.src:hover:before { display: inline;}
|
||||
pre.src-sh:before { content: 'sh'; }
|
||||
pre.src-bash:before { content: 'sh'; }
|
||||
pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
|
||||
pre.src-R:before { content: 'R'; }
|
||||
pre.src-perl:before { content: 'Perl'; }
|
||||
pre.src-java:before { content: 'Java'; }
|
||||
pre.src-sql:before { content: 'SQL'; }
|
||||
|
||||
table { border-collapse:collapse; }
|
||||
caption.t-above { caption-side: top; }
|
||||
caption.t-bottom { caption-side: bottom; }
|
||||
td, th { vertical-align:top; }
|
||||
th.right { text-align: center; }
|
||||
th.left { text-align: center; }
|
||||
th.center { text-align: center; }
|
||||
td.right { text-align: right; }
|
||||
td.left { text-align: left; }
|
||||
td.center { text-align: center; }
|
||||
dt { font-weight: bold; }
|
||||
.footpara:nth-child(2) { display: inline; }
|
||||
.footpara { display: block; }
|
||||
.footdef { margin-bottom: 1em; }
|
||||
.figure { padding: 1em; }
|
||||
.figure p { text-align: center; }
|
||||
.inlinetask {
|
||||
padding: 10px;
|
||||
border: 2px solid gray;
|
||||
margin: 10px;
|
||||
background: #ffffcc;
|
||||
}
|
||||
#org-div-home-and-up
|
||||
{ text-align: right; font-size: 70%; white-space: nowrap; }
|
||||
textarea { overflow-x: auto; }
|
||||
.linenr { font-size: smaller }
|
||||
.code-highlighted { background-color: #ffff00; }
|
||||
.org-info-js_info-navigation { border-style: none; }
|
||||
#org-info-js_console-label
|
||||
{ font-size: 10px; font-weight: bold; white-space: nowrap; }
|
||||
.org-info-js_search-highlight
|
||||
{ background-color: #ffff00; color: #000000; font-weight: bold; }
|
||||
/*]]>*/-->
|
||||
</style>
|
||||
<script type="text/javascript">
|
||||
/*
|
||||
@licstart The following is the entire license notice for the
|
||||
JavaScript code in this tag.
|
||||
|
||||
Copyright (C) 2012-2013 Free Software Foundation, Inc.
|
||||
|
||||
The JavaScript code in this tag is free software: you can
|
||||
redistribute it and/or modify it under the terms of the GNU
|
||||
General Public License (GNU GPL) as published by the Free Software
|
||||
Foundation, either version 3 of the License, or (at your option)
|
||||
any later version. The code is distributed WITHOUT ANY WARRANTY;
|
||||
without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
|
||||
|
||||
As additional permission under GNU GPL version 3 section 7, you
|
||||
may distribute non-source (e.g., minimized or compacted) forms of
|
||||
that code without the copy of the GNU GPL normally required by
|
||||
section 4, provided you include this license notice and a URL
|
||||
through which recipients can access the Corresponding Source.
|
||||
|
||||
|
||||
@licend The above is the entire license notice
|
||||
for the JavaScript code in this tag.
|
||||
*/
|
||||
<!--/*--><![CDATA[/*><!--*/
|
||||
function CodeHighlightOn(elem, id)
|
||||
{
|
||||
var target = document.getElementById(id);
|
||||
if(null != target) {
|
||||
elem.cacheClassElem = elem.className;
|
||||
elem.cacheClassTarget = target.className;
|
||||
target.className = "code-highlighted";
|
||||
elem.className = "code-highlighted";
|
||||
}
|
||||
}
|
||||
function CodeHighlightOff(elem, id)
|
||||
{
|
||||
var target = document.getElementById(id);
|
||||
if(elem.cacheClassElem)
|
||||
elem.className = elem.cacheClassElem;
|
||||
if(elem.cacheClassTarget)
|
||||
target.className = elem.cacheClassTarget;
|
||||
}
|
||||
/*]]>*///-->
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="content">
|
||||
<h1 class="title">OpenFOAM-3.0.x Third-Party packages</h1>
|
||||
<div id="table-of-contents">
|
||||
<h2>Table of Contents</h2>
|
||||
<div id="text-table-of-contents">
|
||||
<ul>
|
||||
<li><a href="#sec-1">1. Description</a></li>
|
||||
<li><a href="#sec-2">2. Order of execution:</a>
|
||||
<ul>
|
||||
<li><a href="#sec-2-1">2.1. Optional</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="#sec-3">3. Versions and locations to download the third party packages</a>
|
||||
<ul>
|
||||
<li><a href="#sec-3-1">3.1. Gcc C++ Compiler</a></li>
|
||||
<li><a href="#sec-3-2">3.2. Parallel Processing</a></li>
|
||||
<li><a href="#sec-3-3">3.3. ParaView</a></li>
|
||||
<li><a href="#sec-3-4">3.4. CGAL</a></li>
|
||||
<li><a href="#sec-3-5">3.5. Miscellaneous</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="#sec-4">4. Notes</a>
|
||||
<ul>
|
||||
<li><a href="#sec-4-1">4.1. Building ParaView-4.3.1/4.4.0</a></li>
|
||||
<li><a href="#sec-4-2">4.2. Building ParaView-4.1.0</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="outline-container-sec-1" class="outline-2">
|
||||
<h2 id="sec-1"><span class="section-number-2">1</span> Description</h2>
|
||||
<div class="outline-text-2" id="text-1">
|
||||
<p>
|
||||
Scripts for building third-party packages.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div id="outline-container-sec-2" class="outline-2">
|
||||
<h2 id="sec-2"><span class="section-number-2">2</span> Order of execution:</h2>
|
||||
<div class="outline-text-2" id="text-2">
|
||||
<ul class="org-ul">
|
||||
<li>makeGcc (recommended if the system gcc is < 4.7)
|
||||
</li>
|
||||
<li>Allwmake (Builds OpenMPI, Scotch etc.)
|
||||
</li>
|
||||
<li>makeCmake (if the system cmake version is < 2.8.8)
|
||||
</li>
|
||||
<li>makeParaView4
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="outline-container-sec-2-1" class="outline-3">
|
||||
<h3 id="sec-2-1"><span class="section-number-3">2.1</span> Optional</h3>
|
||||
<div class="outline-text-3" id="text-2-1">
|
||||
<ul class="org-ul">
|
||||
<li>AllwmakeLibccmio (Only required for conversion of STAR-CCM+ meshes)
|
||||
</li>
|
||||
<li>Allclean (Only required to save disk space)
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="outline-container-sec-3" class="outline-2">
|
||||
<h2 id="sec-3"><span class="section-number-2">3</span> Versions and locations to download the third party packages</h2>
|
||||
<div class="outline-text-2" id="text-3">
|
||||
</div><div id="outline-container-sec-3-1" class="outline-3">
|
||||
<h3 id="sec-3-1"><span class="section-number-3">3.1</span> Gcc C++ Compiler</h3>
|
||||
<div class="outline-text-3" id="text-3-1">
|
||||
<p>
|
||||
The minimum version of gcc required is 4.5.0
|
||||
</p>
|
||||
<ul class="org-ul">
|
||||
<li>gcc <a href="http://gcc.gnu.org/releases.html">http://gcc.gnu.org/releases.html</a>
|
||||
</li>
|
||||
<li>gmp <a href="http://gmplib.org/">http://gmplib.org/</a>
|
||||
<a href="ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2">ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2</a>
|
||||
</li>
|
||||
<li>mpfr <a href="http://www.mpfr.org/">http://www.mpfr.org/</a>
|
||||
<a href="ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.bz2">ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.bz2</a>
|
||||
</li>
|
||||
<li>mpc <a href="http://www.multiprecision.org/">http://www.multiprecision.org/</a>
|
||||
<a href="http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz">http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="outline-container-sec-3-2" class="outline-3">
|
||||
<h3 id="sec-3-2"><span class="section-number-3">3.2</span> Parallel Processing</h3>
|
||||
<div class="outline-text-3" id="text-3-2">
|
||||
<ul class="org-ul">
|
||||
<li>OpenMPI: <a href="http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.0.tar.bz2">http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.0.tar.bz2</a>
|
||||
</li>
|
||||
<li>Scotch/PtScotch: <a href="https://gforge.inria.fr/frs/download.php/file/34099/scotch_6.0.3.tar.gz">https://gforge.inria.fr/frs/download.php/file/34099/scotch_6.0.3.tar.gz</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="outline-container-sec-3-3" class="outline-3">
|
||||
<h3 id="sec-3-3"><span class="section-number-3">3.3</span> ParaView</h3>
|
||||
<div class="outline-text-3" id="text-3-3">
|
||||
<ul class="org-ul">
|
||||
<li>cmake <a href="http://www.cmake.org/files/v3.2/cmake-3.2.1.tar.gz">http://www.cmake.org/files/v3.2/cmake-3.2.1.tar.gz</a>
|
||||
</li>
|
||||
<li>ParaView <a href="http://www.paraview.org/files/v4.4/ParaView-v4.4.0-source.tar.gz">http://www.paraview.org/files/v4.4/ParaView-v4.4.0-source.tar.gz</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="outline-container-sec-3-4" class="outline-3">
|
||||
<h3 id="sec-3-4"><span class="section-number-3">3.4</span> CGAL</h3>
|
||||
<div class="outline-text-3" id="text-3-4">
|
||||
<ul class="org-ul">
|
||||
<li>CGAL <a href="https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.7/CGAL-4.7.tar.xz">https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.7/CGAL-4.7.tar.xz</a>
|
||||
</li>
|
||||
<li>boost <a href="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download">http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="outline-container-sec-3-5" class="outline-3">
|
||||
<h3 id="sec-3-5"><span class="section-number-3">3.5</span> Miscellaneous</h3>
|
||||
<div class="outline-text-3" id="text-3-5">
|
||||
<ul class="org-ul">
|
||||
<li>libccmio <a href="http://portal.nersc.gov/svn/visit/trunk/third_party/libccmio-2.6.1.tar.gz">http://portal.nersc.gov/svn/visit/trunk/third_party/libccmio-2.6.1.tar.gz</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="outline-container-sec-4" class="outline-2">
|
||||
<h2 id="sec-4"><span class="section-number-2">4</span> Notes</h2>
|
||||
<div class="outline-text-2" id="text-4">
|
||||
</div><div id="outline-container-sec-4-1" class="outline-3">
|
||||
<h3 id="sec-4-1"><span class="section-number-3">4.1</span> Building ParaView-4.3.1/4.4.0</h3>
|
||||
<div class="outline-text-3" id="text-4-1">
|
||||
<p>
|
||||
The ParaView-4.3.1/4.4.0 source-pack provided by KitWare will not build and
|
||||
install correctly without a minor correction: lines 653-656 must be removed
|
||||
or commented from file
|
||||
<i>ThirdParty-3.0.0/ParaView-4.?.?/Qt/Components/CMakeLists.txt</i> after
|
||||
unpacking and renaming the ParaView-4.?.? directory. This is because the
|
||||
file ui_pqExportStateWizard.h referred to in the lines 653-656:
|
||||
</p>
|
||||
<div class="org-src-container">
|
||||
|
||||
<pre class="src src-C"><span style="color: #0000cd; font-weight: bold;">if</span>(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
|
||||
install(FILES <span style="color: #008b00;">"${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"</span>
|
||||
DESTINATION <span style="color: #008b00;">"${VTK_INSTALL_INCLUDE_DIR}"</span>)
|
||||
endif()
|
||||
</pre>
|
||||
</div>
|
||||
<p>
|
||||
does not exist and cannot be installed causing the build and installation to
|
||||
fail.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Additionally for ParaView-4.4.0 there is a bug in the STL reader which can
|
||||
be patched by running the following command from within the ThirdParty-???
|
||||
directory:
|
||||
</p>
|
||||
<ul class="org-ul">
|
||||
<li>wget <a href="https://raw.githubusercontent.com/Kitware/VTK/40937e934308e5009e80769dc0c451ee4f157749/IO/Geometry/vtkSTLReader.cxx">https://raw.githubusercontent.com/Kitware/VTK/40937e934308e5009e80769dc0c451ee4f157749/IO/Geometry/vtkSTLReader.cxx</a> -O ParaView-4.4.0/VTK/IO/Geometry/vtkSTLReader.cxx
|
||||
</li>
|
||||
</ul>
|
||||
<p>
|
||||
See also <a href="http://www.openfoam.org/mantisbt/view.php?id=1887">http://www.openfoam.org/mantisbt/view.php?id=1887</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="outline-container-sec-4-2" class="outline-3">
|
||||
<h3 id="sec-4-2"><span class="section-number-3">4.2</span> Building ParaView-4.1.0</h3>
|
||||
<div class="outline-text-3" id="text-4-2">
|
||||
<p>
|
||||
On Ubuntu 14.10 and higher, OpenSuSE 13.2 and probably other recent
|
||||
GNU/Linux distributions there is an issue in the GL libraries requiring a
|
||||
change to the vtkXOpenGLRenderWindow.cxx file in ParaView: Uncomment line 30
|
||||
</p>
|
||||
|
||||
<p>
|
||||
#define GLX_GLXEXT_LEGACY
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="postamble" class="status">
|
||||
<p class="date">Date: 3rd November 2015</p>
|
||||
<p class="date">Created: 2015-11-03 Tue 17:54</p>
|
||||
<p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5 (<a href="http://orgmode.org">Org</a> mode 8.2.10)</p>
|
||||
<p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
49
README.org
49
README.org
@ -1,11 +1,11 @@
|
||||
# -*- mode: org; -*-
|
||||
#
|
||||
#+TITLE: OpenFOAM-3.0.x Third-Party packages
|
||||
#+TITLE: OpenFOAM Third-Party packages
|
||||
#+AUTHOR: The OpenFOAM Foundation
|
||||
#+DATE: 3rd November 2015
|
||||
#+DATE: 31th May 2016
|
||||
#+LINK: http://www.openfoam.org
|
||||
#+OPTIONS: author:nil ^:{}
|
||||
# Copyright (c) 2015 OpenFOAM Foundation.
|
||||
# Copyright (c) 2014-2016 OpenFOAM Foundation.
|
||||
|
||||
* Description
|
||||
Scripts for building third-party packages.
|
||||
@ -13,7 +13,7 @@
|
||||
+ makeGcc (recommended if the system gcc is < 4.7)
|
||||
+ Allwmake (Builds OpenMPI, Scotch etc.)
|
||||
+ makeCmake (if the system cmake version is < 2.8.8)
|
||||
+ makeParaView4
|
||||
+ makeParaView
|
||||
*** Optional
|
||||
+ AllwmakeLibccmio (Only required for conversion of STAR-CCM+ meshes)
|
||||
+ Allclean (Only required to save disk space)
|
||||
@ -28,24 +28,29 @@
|
||||
+ mpc http://www.multiprecision.org/
|
||||
http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz
|
||||
*** Parallel Processing
|
||||
+ OpenMPI: http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.0.tar.bz2
|
||||
+ Scotch/PtScotch: https://gforge.inria.fr/frs/download.php/file/34099/scotch_6.0.3.tar.gz
|
||||
***** Scotch
|
||||
+ Scotch/PtScotch: https://gforge.inria.fr/frs/download.php/file/34099/scotch_6.0.3.tar.gz
|
||||
***** OpenMPI
|
||||
+ OpenMPI: http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.2.tar.bz2
|
||||
*** ParaView
|
||||
+ cmake http://www.cmake.org/files/v3.2/cmake-3.2.1.tar.gz
|
||||
+ ParaView http://www.paraview.org/files/v4.4/ParaView-v4.4.0-source.tar.gz
|
||||
+ cmake http://www.cmake.org/files/v3.2/cmake-3.2.1.tar.gz
|
||||
+ ParaView-4.4.0 http://www.paraview.org/files/v4.4/ParaView-v4.4.0-source.tar.gz
|
||||
+ ParaView-5.0.1 http://www.paraview.org/files/v5.0/ParaView-v5.0.1-source.tar.gz
|
||||
but may need patching to compile (See [[Notes]]).
|
||||
*** CGAL
|
||||
+ CGAL https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.7/CGAL-4.7.tar.xz
|
||||
+ CGAL https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.8/CGAL-4.8.tar.xz
|
||||
+ boost http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download
|
||||
*** Miscellaneous
|
||||
+ libccmio http://portal.nersc.gov/svn/visit/trunk/third_party/libccmio-2.6.1.tar.gz
|
||||
* Notes
|
||||
*** Building ParaView-4.3.1/4.4.0
|
||||
The ParaView-4.3.1/4.4.0 source-pack provided by KitWare will not build and
|
||||
install correctly without a minor correction: lines 653-656 must be removed
|
||||
or commented from file
|
||||
/ThirdParty-3.0.0/ParaView-4.?.?/Qt/Components/CMakeLists.txt/ after
|
||||
unpacking and renaming the ParaView-4.?.? directory. This is because the
|
||||
file ui_pqExportStateWizard.h referred to in the lines 653-656:
|
||||
*** Building ParaView-4.3.1/4.4.0/5.0.0/5.0.1
|
||||
The ParaView-4.3.1/4.4.0/5.0.0 source-pack provided by KitWare will not
|
||||
build and install correctly without a minor correction: lines 653-656
|
||||
(650-653 in ParaView-5.0.0, 659-662 in ParaView-5.0.1) must be removed or
|
||||
commented from file
|
||||
/ThirdParty-???/ParaView-[45].?.?/Qt/Components/CMakeLists.txt/ after
|
||||
unpacking and renaming the ParaView-[45].?.? directory. This is because the
|
||||
file ui_pqExportStateWizard.h referred to in
|
||||
#+begin_src C
|
||||
if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
|
||||
@ -60,7 +65,17 @@
|
||||
directory:
|
||||
+ wget https://raw.githubusercontent.com/Kitware/VTK/40937e934308e5009e80769dc0c451ee4f157749/IO/Geometry/vtkSTLReader.cxx -O ParaView-4.4.0/VTK/IO/Geometry/vtkSTLReader.cxx
|
||||
See also http://www.openfoam.org/mantisbt/view.php?id=1887
|
||||
|
||||
*** Building ParaView-5.0.1 with gcc-6.1.0
|
||||
***** Add support for gcc-6.?.?
|
||||
The following cmake files
|
||||
+ ParaView-5.0.1/VTK/CMake/vtkCompilerExtras.cmake
|
||||
+ ParaView-5.0.1/VTK/CMake/GenerateExportHeader.cmake
|
||||
specifically limit the gcc versions supported. To add support gcc-6.?.?
|
||||
replace '[345]' with '[3456]'
|
||||
***** SciberQuestToolKit
|
||||
The SciberQuestToolKit plugin fails to compile with gcc-6.1.0 and causes
|
||||
the compilation of ParaView to halt. The easiest solution is to delete
|
||||
the ParaView-5.0.1/Plugins/SciberQuestToolKit directory.
|
||||
*** Building ParaView-4.1.0
|
||||
On Ubuntu 14.10 and higher, OpenSuSE 13.2 and probably other recent
|
||||
GNU/Linux distributions there is an issue in the GL libraries requiring a
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -63,6 +63,9 @@ setDirs()
|
||||
echo "ParaView_SOURCE_DIR=$ParaView_SOURCE_DIR"
|
||||
echo "ParaView_BINARY_DIR=$ParaView_BINARY_DIR"
|
||||
echo "ParaView_DIR=$ParaView_DIR"
|
||||
|
||||
# Forcefully override the .git path for the ParaView source code directory
|
||||
export GIT_DIR=$ParaView_SOURCE_DIR/.git
|
||||
}
|
||||
|
||||
|
||||
@ -71,7 +74,10 @@ setDirs()
|
||||
#
|
||||
setVersion()
|
||||
{
|
||||
[ "$#" -ge 1 ] && ParaView_VERSION="${1##paraview-}"
|
||||
if [ "$#" -ge 1 ]
|
||||
then
|
||||
ParaView_VERSION="${1##paraview-}"
|
||||
fi
|
||||
|
||||
# the major version is "<digits>.<digits>"
|
||||
ParaView_MAJOR=$(echo $ParaView_VERSION | \
|
||||
@ -152,7 +158,10 @@ addCMakeVariable()
|
||||
#
|
||||
addVerbosity()
|
||||
{
|
||||
[ "$withVERBOSE" = true ] && addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
|
||||
if [ "${withVERBOSE:=false}" = true ]
|
||||
then
|
||||
addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@ -161,7 +170,11 @@ addVerbosity()
|
||||
#
|
||||
addMpiSupport()
|
||||
{
|
||||
[ "${withMPI:=false}" = true ] || return
|
||||
if [ "${withMPI:=false}" != true ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
OBJ_ADD="$OBJ_ADD-mpi"
|
||||
|
||||
addCMakeVariable "PARAVIEW_USE_MPI=ON VTK_USE_MPI=ON"
|
||||
@ -174,7 +187,11 @@ addMpiSupport()
|
||||
#
|
||||
addPythonSupport()
|
||||
{
|
||||
[ "${withPYTHON:=false}" = true ] || return
|
||||
if [ "${withPYTHON:=false}" != true ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
OBJ_ADD="$OBJ_ADD-py"
|
||||
|
||||
if pythonBin=$(which python 2>/dev/null)
|
||||
@ -242,7 +259,10 @@ addPythonSupport()
|
||||
#
|
||||
addMesaSupport()
|
||||
{
|
||||
[ "${withMESA:=false}" = true ] || return
|
||||
if [ "${withMESA:=false}" != true ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
if [ -d "$MESA_INCLUDE" -a -f "$MESA_LIBRARY" ]
|
||||
then
|
||||
@ -266,7 +286,10 @@ addMesaSupport()
|
||||
addQtSupport()
|
||||
{
|
||||
QtVersion=none
|
||||
[ "${withQT:=false}" = true ] || return
|
||||
if [ "${withQT:=false}" != true ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
|
||||
|
||||
@ -325,10 +348,10 @@ addQtSupport()
|
||||
QtMajor=$1
|
||||
QtMinor=$2
|
||||
|
||||
if [ $QtMajor -lt 4 ] || [ $QtMajor -eq 4 -a $QtMinor -lt 5 ]
|
||||
if [ $QtMajor -ne 4 -o $QtMajor -eq 4 -a $QtMinor -lt 5 ]
|
||||
then
|
||||
echo "*** Error: Qt version provided < 4.5"
|
||||
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5 "
|
||||
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5 and < 5.0"
|
||||
echo "*** e.g."
|
||||
echo "*** -qmake /usr/local/qt-4.6.2/bin/qmake"
|
||||
echo "*** -qmake $installBASE/qt-4.6.2/bin/qmake"
|
||||
@ -380,7 +403,10 @@ configParaView()
|
||||
fi
|
||||
|
||||
# default to using cmake from the path
|
||||
[ -n "$cmakeExe" ] || cmakeExe=cmake
|
||||
if [ -z "$cmakeExe" ]
|
||||
then
|
||||
cmakeExe=cmake
|
||||
fi
|
||||
|
||||
# remove any existing build folder and recreate
|
||||
if [ -d $ParaView_BINARY_DIR ]
|
||||
@ -391,8 +417,6 @@ configParaView()
|
||||
fi
|
||||
mkdir -p $ParaView_BINARY_DIR
|
||||
|
||||
addCMakeVariable "CMAKE_BUILD_TYPE:STRING=$buildType"
|
||||
|
||||
cd $ParaView_BINARY_DIR || exit 1 # change to build folder
|
||||
|
||||
echo "----"
|
||||
@ -404,7 +428,6 @@ configParaView()
|
||||
echo " Source : $ParaView_SOURCE_DIR"
|
||||
echo " Build : $ParaView_BINARY_DIR"
|
||||
echo " Target : $ParaView_DIR"
|
||||
echo " Build type : $buildType"
|
||||
echo "----"
|
||||
echo
|
||||
echo "$cmakeExe" \
|
||||
@ -436,7 +459,10 @@ makeParaView()
|
||||
|
||||
# remove lib if it is a link
|
||||
# (how this was previously handled before 'make install' worked)
|
||||
[ -L lib ] && rm lib 2>/dev/null
|
||||
if [ -L lib ]
|
||||
then
|
||||
rm lib 2>/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@ -450,6 +476,19 @@ installParaView()
|
||||
|
||||
make install
|
||||
|
||||
# hack for missing files after install of version 3.14.1
|
||||
echo "Copying missing files to install folder"
|
||||
CMAKE_SRC_DIR=$ParaView_SOURCE_DIR/CMake
|
||||
CMAKE_INSTALL_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR/CMake
|
||||
cp -f $ParaView_SOURCE_DIR/ParaViewUse.cmake $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/generate_proxydocumentation.cmake $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/smxml_to_xml.xsl $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/xml_to_html.xsl $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/xml_to_wiki.xsl.in $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/generate_qhp.cmake $CMAKE_INSTALL_DIR
|
||||
unset CMAKE_SRC_DIR CMAKE_INSTALL_DIR
|
||||
# --- end hack
|
||||
|
||||
cat<< INFO
|
||||
---
|
||||
Installation complete for paraview-$ParaView_VERSION
|
||||
@ -472,16 +511,20 @@ unset withMESA MESA_INCLUDE MESA_LIBRARY
|
||||
unset withPYTHON PYTHON_INCLUDE PYTHON_LIBRARY
|
||||
unset CMAKE_VARIABLES
|
||||
unset OBJ_ADD
|
||||
unset buildType
|
||||
|
||||
|
||||
# start with these general settings
|
||||
addCMakeVariable "VTK_USE_TK:BOOL=OFF"
|
||||
addCMakeVariable "BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF"
|
||||
addCMakeVariable "CMAKE_BUILD_TYPE:STRING=Release"
|
||||
|
||||
# include development files in "make install"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
|
||||
|
||||
# don't build test tree
|
||||
addCMakeVariable "BUILD_TESTING:BOOL=OFF"
|
||||
|
||||
# remove dependency on WebKit
|
||||
# addCMakeVariable VTK_QT_USE_WEBKIT:BOOL=OFF
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
@ -2,7 +2,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -32,7 +32,7 @@
|
||||
# buildBASE, installBASE defined from tools/ThirdPartyFunctions
|
||||
|
||||
#
|
||||
# where things are or should be put
|
||||
# Where things are or should be put
|
||||
# ParaView_VERSION and ParaView_MAJOR should already have been set
|
||||
#
|
||||
# ParaView_SOURCE_DIR : location of the original sources
|
||||
@ -63,17 +63,23 @@ setDirs()
|
||||
echo "ParaView_SOURCE_DIR=$ParaView_SOURCE_DIR"
|
||||
echo "ParaView_BINARY_DIR=$ParaView_BINARY_DIR"
|
||||
echo "ParaView_DIR=$ParaView_DIR"
|
||||
|
||||
# Forcefully override the .git path for the ParaView source code directory
|
||||
export GIT_DIR=$ParaView_SOURCE_DIR/.git
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# set ParaView_VERSION and adjust ParaView_MAJOR accordingly
|
||||
# Set ParaView_VERSION and adjust ParaView_MAJOR accordingly
|
||||
#
|
||||
setVersion()
|
||||
{
|
||||
[ "$#" -ge 1 ] && ParaView_VERSION="${1##paraview-}"
|
||||
if [ "$#" -ge 1 ]
|
||||
then
|
||||
ParaView_VERSION="${1##paraview-}"
|
||||
fi
|
||||
|
||||
# the major version is "<digits>.<digits>"
|
||||
# The major version is "<digits>.<digits>"
|
||||
ParaView_MAJOR=$(echo $ParaView_VERSION | \
|
||||
sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
|
||||
|
||||
@ -84,7 +90,7 @@ setVersion()
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# extract and echo date stamp information from
|
||||
# Extract and echo date stamp information from
|
||||
# VTK/Utilities/kwsys/kwsysDateStamp.cmake
|
||||
# since the order of the entries is already correct, can use simple sed script
|
||||
#
|
||||
@ -101,9 +107,8 @@ echoDateStamp()
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# extract version information from
|
||||
# Extract version information from
|
||||
# CMakeLists.txt
|
||||
# since the order of the entries is already correct, can use simple sed script
|
||||
#
|
||||
@ -121,7 +126,7 @@ getVersion()
|
||||
}
|
||||
|
||||
#
|
||||
# compare version information
|
||||
# Compare version information
|
||||
#
|
||||
checkVersion()
|
||||
{
|
||||
@ -135,7 +140,7 @@ checkVersion()
|
||||
}
|
||||
|
||||
#
|
||||
# set CMake cache variables
|
||||
# Set CMake cache variables
|
||||
#
|
||||
addCMakeVariable()
|
||||
{
|
||||
@ -148,20 +153,27 @@ addCMakeVariable()
|
||||
|
||||
|
||||
#
|
||||
# verbose makefiles
|
||||
# Verbose makefiles
|
||||
#
|
||||
addVerbosity()
|
||||
{
|
||||
[ "$withVERBOSE" = true ] && addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
|
||||
if [ "${withVERBOSE:=false}" = true ]
|
||||
then
|
||||
addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# define options for mpi support
|
||||
# Define options for mpi support
|
||||
#
|
||||
addMpiSupport()
|
||||
{
|
||||
[ "${withMPI:=false}" = true ] || return
|
||||
if [ "${withMPI:=false}" != true ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
OBJ_ADD="$OBJ_ADD-mpi"
|
||||
|
||||
addCMakeVariable "PARAVIEW_USE_MPI=ON VTK_USE_MPI=ON"
|
||||
@ -170,18 +182,22 @@ addMpiSupport()
|
||||
|
||||
|
||||
#
|
||||
# define options for python support
|
||||
# Define options for python support
|
||||
#
|
||||
addPythonSupport()
|
||||
{
|
||||
[ "${withPYTHON:=false}" = true ] || return
|
||||
if [ "${withPYTHON:=false}" != true ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
OBJ_ADD="$OBJ_ADD-py"
|
||||
|
||||
if pythonBin=$(which python 2>/dev/null)
|
||||
then
|
||||
if [ -n "$PYTHON_LIBRARY" ]
|
||||
then
|
||||
# check $PYTHON_LIBRARY if it has been set
|
||||
# Check $PYTHON_LIBRARY if it has been set
|
||||
if [ ! -e "$PYTHON_LIBRARY" ]
|
||||
then
|
||||
echo "*** Error: libpython not found at location specified " \
|
||||
@ -208,7 +224,7 @@ addPythonSupport()
|
||||
pythonMajor=$(echo $PYTHON_LIBRARY | sed 's/.*libpython\(.*\)\.so.*/\1/')
|
||||
pythonInclude=/usr/include/python$pythonMajor
|
||||
|
||||
# note - we could also allow for a PYTHON_INCLUDE variable ...
|
||||
# Note - we could also allow for a PYTHON_INCLUDE variable ...
|
||||
[ -d "$pythonInclude" ] || {
|
||||
echo " No python headers found in $pythonInclude/"
|
||||
echo " Please install python headers or deactivate "
|
||||
@ -238,11 +254,14 @@ addPythonSupport()
|
||||
|
||||
|
||||
#
|
||||
# define options for mesa support
|
||||
# Define options for mesa support
|
||||
#
|
||||
addMesaSupport()
|
||||
{
|
||||
[ "${withMESA:=false}" = true ] || return
|
||||
if [ "${withMESA:=false}" != true ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
if [ -d "$MESA_INCLUDE" -a -f "$MESA_LIBRARY" ]
|
||||
then
|
||||
@ -266,7 +285,11 @@ addMesaSupport()
|
||||
addQtSupport()
|
||||
{
|
||||
QtVersion=none
|
||||
[ "${withQT:=false}" = true ] || return
|
||||
|
||||
if [ "${withQT:=false}" != true ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
|
||||
|
||||
@ -289,7 +312,7 @@ addQtSupport()
|
||||
|
||||
if [ -n "$qmakeExe" ]
|
||||
then
|
||||
# use absolute path
|
||||
# Use absolute path
|
||||
if [ "${qmakeExe#/}" = "$qmakeExe" ]
|
||||
then
|
||||
qmakeExe="$(cd ${qmakeExe%/qmake} 2>/dev/null && pwd)/qmake"
|
||||
@ -303,7 +326,7 @@ addQtSupport()
|
||||
fi
|
||||
fi
|
||||
|
||||
# default to using qmake from the path
|
||||
# Default to using qmake from the path
|
||||
if [ -n "$qmakeExe" ]
|
||||
then
|
||||
addCMakeVariable "QT_QMAKE_EXECUTABLE:FILEPATH=$qmakeExe"
|
||||
@ -319,16 +342,16 @@ addQtSupport()
|
||||
# parse -> "Using Qt version X.Y.Z in ..."
|
||||
QtVersion=$($qmakeExe -query QT_VERSION)
|
||||
|
||||
# split Major.Minor.Revision - could also use IFS hacking
|
||||
# Split Major.Minor.Revision - could also use IFS hacking
|
||||
set -- $(echo "$QtVersion" | sed -e 's/\./ /g')
|
||||
|
||||
QtMajor=$1
|
||||
QtMinor=$2
|
||||
|
||||
if [[ ($QtMajor -lt 4) || ($QtMajor -eq 4 && $QtMinor -lt 5) ]]
|
||||
if [ $QtMajor -lt 4 -o $QtMajor -eq 4 -a $QtMinor -lt 5 ]
|
||||
then
|
||||
echo "*** Error: Qt version provided < 4.5"
|
||||
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5 "
|
||||
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5"
|
||||
echo "*** e.g."
|
||||
echo "*** -qmake /usr/local/qt-4.6.2/bin/qmake"
|
||||
echo "*** -qmake $installBASE/qt-4.6.2/bin/qmake"
|
||||
@ -342,7 +365,7 @@ addQtSupport()
|
||||
|
||||
|
||||
#
|
||||
# configure via cmake, but don't actually build anything
|
||||
# Configure via cmake, but don't actually build anything
|
||||
#
|
||||
configParaView()
|
||||
{
|
||||
@ -365,7 +388,7 @@ configParaView()
|
||||
|
||||
if [ -n "$cmakeExe" ]
|
||||
then
|
||||
# use absolute path
|
||||
# Use absolute path
|
||||
if [ "${cmakeExe#/}" = "$cmakeExe" ]
|
||||
then
|
||||
cmakeExe="$(cd ${cmakeExe%/cmake} 2>/dev/null && pwd)/cmake"
|
||||
@ -379,10 +402,13 @@ configParaView()
|
||||
fi
|
||||
fi
|
||||
|
||||
# default to using cmake from the path
|
||||
[ -n "$cmakeExe" ] || cmakeExe=cmake
|
||||
# Default to using cmake from the path
|
||||
if [ -z "$cmakeExe" ]
|
||||
then
|
||||
cmakeExe=cmake
|
||||
fi
|
||||
|
||||
# remove any existing build folder and recreate
|
||||
# Remove any existing build folder and recreate
|
||||
if [ -d $ParaView_BINARY_DIR ]
|
||||
then
|
||||
echo "removing old build directory"
|
||||
@ -391,7 +417,9 @@ configParaView()
|
||||
fi
|
||||
mkdir -p $ParaView_BINARY_DIR
|
||||
|
||||
cd $ParaView_BINARY_DIR || exit 1 # change to build folder
|
||||
addCMakeVariable "CMAKE_BUILD_TYPE:STRING=$buildType"
|
||||
|
||||
cd $ParaView_BINARY_DIR || exit 1 # Change to build folder
|
||||
|
||||
echo "----"
|
||||
echo "Configuring paraview-$ParaView_VERSION (major version: $ParaView_MAJOR)"
|
||||
@ -402,6 +430,7 @@ configParaView()
|
||||
echo " Source : $ParaView_SOURCE_DIR"
|
||||
echo " Build : $ParaView_BINARY_DIR"
|
||||
echo " Target : $ParaView_DIR"
|
||||
echo " Build type : $buildType"
|
||||
echo "----"
|
||||
echo
|
||||
echo "$cmakeExe" \
|
||||
@ -412,7 +441,7 @@ configParaView()
|
||||
echo "----"
|
||||
echo
|
||||
|
||||
# run cmake to create Makefiles
|
||||
# Run cmake to create Makefiles
|
||||
$cmakeExe \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$ParaView_DIR \
|
||||
$CMAKE_VARIABLES \
|
||||
@ -421,53 +450,40 @@ configParaView()
|
||||
|
||||
|
||||
#
|
||||
# invoke make
|
||||
# Invoke make
|
||||
# also link bin/ to lib/paraview-* for development without installation
|
||||
#
|
||||
makeParaView()
|
||||
{
|
||||
cd $ParaView_BINARY_DIR || exit 1 # change to build folder
|
||||
cd $ParaView_BINARY_DIR || exit 1 # Change to build folder
|
||||
echo " Starting make"
|
||||
time make -j $WM_NCOMPPROCS
|
||||
echo " Done make"
|
||||
|
||||
# remove lib if it is a link
|
||||
# Remove lib if it is a link
|
||||
# (how this was previously handled before 'make install' worked)
|
||||
[ -L lib ] && rm lib 2>/dev/null
|
||||
if [ -L lib ]
|
||||
then
|
||||
rm lib 2>/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# install the program
|
||||
# Install the program
|
||||
#
|
||||
installParaView()
|
||||
{
|
||||
cd $ParaView_BINARY_DIR || exit 1 # change to build folder
|
||||
cd $ParaView_BINARY_DIR || exit 1 # Change to build folder
|
||||
echo " Installing ParaView to $ParaView_DIR"
|
||||
|
||||
make install
|
||||
|
||||
# hack for missing files after install of version 3.14.1
|
||||
echo "Copying missing files to install folder"
|
||||
CMAKE_SRC_DIR=$ParaView_SOURCE_DIR/CMake
|
||||
CMAKE_INSTALL_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR/CMake
|
||||
cp -f $ParaView_SOURCE_DIR/ParaViewUse.cmake $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/generate_proxydocumentation.cmake $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/smxml_to_xml.xsl $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/xml_to_html.xsl $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/xml_to_wiki.xsl.in $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/generate_qhp.cmake $CMAKE_INSTALL_DIR
|
||||
unset CMAKE_SRC_DIR CMAKE_INSTALL_DIR
|
||||
# --- end hack
|
||||
|
||||
cat<< INFO
|
||||
---
|
||||
Installation complete for paraview-$ParaView_VERSION
|
||||
Set environment variables:
|
||||
|
||||
export ParaView_DIR=$ParaView_DIR
|
||||
export PATH=\$ParaView_DIR/bin:\$PATH
|
||||
export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview-$ParaView_MAJOR
|
||||
Now update the environment by running:
|
||||
wmRefresh
|
||||
---
|
||||
INFO
|
||||
}
|
||||
@ -475,27 +491,23 @@ INFO
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# clear the referenced variables before using any of the functions
|
||||
# Clear the referenced variables before using any of the functions
|
||||
unset withMPI withVERBOSE
|
||||
unset withQT QMAKE_PATH
|
||||
unset withMESA MESA_INCLUDE MESA_LIBRARY
|
||||
unset withPYTHON PYTHON_INCLUDE PYTHON_LIBRARY
|
||||
unset CMAKE_VARIABLES
|
||||
unset OBJ_ADD
|
||||
unset buildType
|
||||
|
||||
|
||||
# start with these general settings
|
||||
addCMakeVariable "VTK_USE_TK:BOOL=OFF"
|
||||
# Start with these general settings
|
||||
addCMakeVariable "BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF"
|
||||
addCMakeVariable "CMAKE_BUILD_TYPE:STRING=Release"
|
||||
|
||||
# include development files in "make install"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
|
||||
# Include development files in "make install"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
|
||||
|
||||
# don't build test tree
|
||||
# Don't build test tree
|
||||
addCMakeVariable "BUILD_TESTING:BOOL=OFF"
|
||||
|
||||
# remove dependency on WebKit
|
||||
# addCMakeVariable VTK_QT_USE_WEBKIT:BOOL=OFF
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -31,12 +31,13 @@
|
||||
# Define WM_NCOMPPROCS always.
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# define the normal build and prefix directories
|
||||
# Define the normal build and prefix directories
|
||||
buildBASE=$WM_THIRD_PARTY_DIR/build/$WM_ARCH$WM_COMPILER
|
||||
installBASE=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
|
||||
|
||||
|
||||
#
|
||||
# mostly building without wmake
|
||||
# Mostly building without wmake
|
||||
# - disable wmakeScheduler variables
|
||||
# - restrict WM_NCOMPPROCS to local number of cores
|
||||
#
|
||||
@ -53,7 +54,16 @@ fi
|
||||
|
||||
|
||||
#
|
||||
# download file $1 from url $2 into download/ directory
|
||||
# If WM_CONTINUE_ON_ERROR not set activate the shell option "stop on error"
|
||||
#
|
||||
if [ -z "${WM_CONTINUE_ON_ERROR}" ]
|
||||
then
|
||||
set -e
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Download file $1 from url $2 into download/ directory
|
||||
#
|
||||
downloadFile()
|
||||
{
|
||||
@ -75,7 +85,7 @@ downloadFile()
|
||||
|
||||
|
||||
#
|
||||
# copy Make/{files,options} from wmakeFiles/PACKAGE
|
||||
# Copy Make/{files,options} from wmakeFiles/PACKAGE
|
||||
#
|
||||
# $1 = PACKAGE
|
||||
# $2 (optional) TARGET DIRECTORY
|
||||
@ -119,4 +129,4 @@ cpMakeFiles()
|
||||
}
|
||||
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
47
makeCGAL
47
makeCGAL
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -37,15 +37,22 @@
|
||||
# Mixing system and ThirdParty for gmp/mpfr is not supported.
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Get CGAL, boost and gmp/mpfr versions
|
||||
. $WM_PROJECT_DIR/etc/config.sh/functions
|
||||
_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
|
||||
$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
|
||||
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler)
|
||||
|
||||
set -x
|
||||
|
||||
cgalPACKAGE=CGAL-4.7
|
||||
boostPACKAGE=boost-system
|
||||
gmpPACKAGE=gmp-system
|
||||
mpfrPACKAGE=mpfr-system
|
||||
cgalPACKAGE=${cgal_version:-CGAL-4.8}
|
||||
boostPACKAGE=${boost_version:-boost-system}
|
||||
gmpPACKAGE=${gmp_version:-gmp-system}
|
||||
mpfrPACKAGE=${mpfr_version:-mpfr-system}
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# run from third-party directory only
|
||||
# Run from third-party directory only
|
||||
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
|
||||
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
|
||||
echo " The environment variables are inconsistent with the installation."
|
||||
@ -83,11 +90,11 @@ USAGE
|
||||
}
|
||||
|
||||
|
||||
# ensure CMake gets the correct C++ compiler
|
||||
# Ensure CMake gets the correct C++ compiler
|
||||
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
|
||||
|
||||
|
||||
# parse options
|
||||
# Parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
do
|
||||
case "$1" in
|
||||
@ -159,7 +166,7 @@ then
|
||||
else
|
||||
boostInc="/usr/include"
|
||||
|
||||
# for completeness:
|
||||
# For completeness:
|
||||
# 64-bit needs lib64, but 32-bit needs lib (not lib32)
|
||||
if [ "$WM_ARCH_OPTION" = 64 ]
|
||||
then
|
||||
@ -170,7 +177,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# retrieve boost version:
|
||||
# Retrieve boost version:
|
||||
if [ -f "$boostInc/boost/version.hpp" ]
|
||||
then
|
||||
BOOST_VERSION_NO=`sed -ne 's/^#define *BOOST_VERSION *\([0-9][0-9]*\).*$/\1/p' $boostInc/boost/version.hpp`
|
||||
@ -180,6 +187,11 @@ else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$cgal_version" = "cgal-system" ]
|
||||
then
|
||||
echo "Using system installation of CGAL"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
#
|
||||
# Build CGAL
|
||||
@ -201,7 +213,7 @@ GMP_ARCH_PATH=$installBASE/$gmpPACKAGE
|
||||
MPFR_ARCH_PATH=$installBASE/$mpfrPACKAGE
|
||||
|
||||
(
|
||||
# remove any existing build folder and recreate
|
||||
# Remove any existing build folder and recreate
|
||||
if [ -d $CGAL_BINARY_DIR ]
|
||||
then
|
||||
echo "removing old build directory"
|
||||
@ -246,13 +258,13 @@ CMAKE_OPTIONS
|
||||
echo " ThirdParty : gmp/mpfr"
|
||||
configGmpMpfr=$(cat <<CMAKE_OPTIONS
|
||||
-DGMP_INCLUDE_DIR=$GMP_ARCH_PATH/include
|
||||
-DGMP_LIBRARIES_DIR=$GMP_ARCH_PATH/lib
|
||||
-DGMP_LIBRARIES=$GMP_ARCH_PATH/lib/libgmp.so
|
||||
-DGMP_LIBRARIES_DIR=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
|
||||
-DGMP_LIBRARIES=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libgmp.so
|
||||
-DGMPXX_INCLUDE_DIR=$GMP_ARCH_PATH/include
|
||||
-DGMPXX_LIBRARIES=$GMP_ARCH_PATH/lib/libgmpxx.so
|
||||
-DGMPXX_LIBRARIES=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libgmpxx.so
|
||||
-DMPFR_INCLUDE_DIR=$MPFR_ARCH_PATH/include
|
||||
-DMPFR_LIBRARIES_DIR=$MPFR_ARCH_PATH/lib
|
||||
-DMPFR_LIBRARIES=$MPFR_ARCH_PATH/lib/libmpfr.so
|
||||
-DMPFR_LIBRARIES_DIR=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
|
||||
-DMPFR_LIBRARIES=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpfr.so
|
||||
CMAKE_OPTIONS
|
||||
)
|
||||
else
|
||||
@ -264,6 +276,7 @@ CMAKE_OPTIONS
|
||||
cmake \
|
||||
-DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DWITH_CGAL_Qt5=OFF \
|
||||
$configBoost $configGmpMpfr \
|
||||
$CGAL_SOURCE_DIR \
|
||||
&& make -j $WM_NCOMPPROCS \
|
||||
@ -287,4 +300,4 @@ CMAKE_OPTIONS
|
||||
echo "Done CGAL"
|
||||
)
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -120,4 +120,4 @@ else
|
||||
}
|
||||
fi
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
63
makeGcc
63
makeGcc
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -29,10 +29,16 @@
|
||||
# Build script for gmp, mpfr and gcc-[4-9].?.?
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
gmpPACKAGE=gmp-5.1.2
|
||||
mpfrPACKAGE=mpfr-3.1.2
|
||||
mpcPACKAGE=mpc-1.0.1
|
||||
gccPACKAGE=
|
||||
|
||||
# get default GCC, mpfr, gmp and mpc versions
|
||||
. $WM_PROJECT_DIR/etc/config.sh/functions
|
||||
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler)
|
||||
|
||||
gmpPACKAGE=${gmp_version:-gmp-5.1.2}
|
||||
mpfrPACKAGE=${mpfr_version:-mpfr-3.1.2}
|
||||
mpcPACKAGE=${mpc_version:-mpc-1.0.1}
|
||||
gccPACKAGE=$gcc_version
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Run from third-party directory only
|
||||
@ -50,7 +56,10 @@ usage() {
|
||||
while [ "$#" -ge 1 ]; do echo "$1"; shift; done
|
||||
cat<<USAGE
|
||||
|
||||
usage: ${0##*/} [gmp-VERSION] [mpfr-VERSION] [mpc-VERSION] <gcc-VERSION>
|
||||
usage: ${0##*/} [option] [gmp-VERSION] [mpfr-VERSION] [mpc-VERSION] <gcc-VERSION>
|
||||
options:
|
||||
-no-multilib for 64-bit systems that don't have 32-bit support
|
||||
-help
|
||||
|
||||
* build combinations of gmp, mpfr, mpc and gcc
|
||||
$gmpPACKAGE
|
||||
@ -62,6 +71,7 @@ USAGE
|
||||
exit 1
|
||||
}
|
||||
|
||||
GCC_BUILD_OPTIONS=""
|
||||
|
||||
# Parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
@ -70,6 +80,10 @@ do
|
||||
-h | -help)
|
||||
usage
|
||||
;;
|
||||
-no-multilib)
|
||||
GCC_BUILD_OPTIONS="--disable-multilib"
|
||||
shift
|
||||
;;
|
||||
gmp-[4-9]*)
|
||||
gmpPACKAGE="${1%%/}"
|
||||
shift
|
||||
@ -120,13 +134,6 @@ GMP_ARCH_PATH=$installBASE/$gmpPACKAGE
|
||||
MPFR_ARCH_PATH=$installBASE/$mpfrPACKAGE
|
||||
MPC_ARCH_PATH=$installBASE/$mpcPACKAGE
|
||||
|
||||
# mpc is not needed for gcc older than 4.5
|
||||
case "$gccPACKAGE" in
|
||||
gcc-4.[0-4].*)
|
||||
mpcPACKAGE=false
|
||||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Build GMP
|
||||
#
|
||||
@ -151,6 +158,7 @@ else
|
||||
set -x
|
||||
$sourceDIR/configure ABI=$ABI \
|
||||
--prefix=$GMP_ARCH_PATH \
|
||||
--libdir=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
--enable-cxx \
|
||||
&& make -j $WM_NCOMPPROCS \
|
||||
&& make install \
|
||||
@ -187,7 +195,9 @@ else
|
||||
set -x
|
||||
$sourceDIR/configure ABI=$ABI \
|
||||
--prefix=$MPFR_ARCH_PATH \
|
||||
--with-gmp=$GMP_ARCH_PATH \
|
||||
--libdir=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
--with-gmp-include=$GMP_ARCH_PATH/include \
|
||||
--with-gmp-lib=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
&& make -j $WM_NCOMPPROCS \
|
||||
&& make install \
|
||||
&& echo "Built: $mpfrPACKAGE"
|
||||
@ -206,9 +216,6 @@ echo "---------------"
|
||||
if [ -d $MPC_ARCH_PATH ]
|
||||
then
|
||||
echo "Already built: $mpcPACKAGE"
|
||||
elif [ "$mpcPACKAGE" = false ]
|
||||
then
|
||||
echo "Skip building mpc - not needed for older gcc versions"
|
||||
else
|
||||
echo "Starting build: $mpcPACKAGE"
|
||||
echo
|
||||
@ -226,8 +233,11 @@ else
|
||||
set -x
|
||||
$sourceDIR/configure ABI=$ABI \
|
||||
--prefix=$MPC_ARCH_PATH \
|
||||
--with-gmp=$GMP_ARCH_PATH \
|
||||
--with-mpfr=$MPFR_ARCH_PATH \
|
||||
--libdir=$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
--with-gmp-include=$GMP_ARCH_PATH/include \
|
||||
--with-gmp-lib=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
--with-mpfr-include=$MPFR_ARCH_PATH/include \
|
||||
--with-mpfr-lib=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
&& make -j $WM_NCOMPPROCS \
|
||||
&& make install \
|
||||
&& echo "Built: $mpcPACKAGE"
|
||||
@ -263,9 +273,6 @@ else
|
||||
cd $sourceDIR || exit 1
|
||||
make distclean 2>/dev/null
|
||||
|
||||
unset withMpc
|
||||
[ -d "$MPC_ARCH_PATH" ] && withMpc="--with-mpc=$MPC_ARCH_PATH"
|
||||
|
||||
rm -rf $buildDIR
|
||||
mkdir -p $buildDIR
|
||||
cd $buildDIR
|
||||
@ -273,14 +280,18 @@ else
|
||||
set -x
|
||||
$sourceDIR/configure \
|
||||
--prefix=$GCC_ARCH_PATH \
|
||||
--with-gmp=$GMP_ARCH_PATH \
|
||||
--with-mpfr=$MPFR_ARCH_PATH \
|
||||
$withMpc \
|
||||
--with-gmp-include=$GMP_ARCH_PATH/include \
|
||||
--with-gmp-lib=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
--with-mpfr-include=$MPFR_ARCH_PATH/include \
|
||||
--with-mpfr-lib=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
--with-mpc-include=$MPC_ARCH_PATH/include \
|
||||
--with-mpc-lib=$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||
--with-pkgversion=OpenFOAM \
|
||||
--enable-languages=c,c++ \
|
||||
--enable-__cxa_atexit \
|
||||
--enable-libstdcxx-allocator=new \
|
||||
--with-system-zlib \
|
||||
$GCC_BUILD_OPTIONS \
|
||||
MAKEINFO=missing \
|
||||
&& make -j $WM_NCOMPPROCS \
|
||||
&& make install \
|
||||
@ -292,4 +303,4 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -115,4 +115,4 @@ else
|
||||
}
|
||||
fi
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
11
makeLLVM
11
makeLLVM
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -37,7 +37,12 @@
|
||||
# cd -
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
llvmPACKAGE=llvm-3.6.0
|
||||
|
||||
# get default llvm version
|
||||
. $WM_PROJECT_DIR/etc/config.sh/functions
|
||||
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler)
|
||||
|
||||
llvmPACKAGE=${clang_version:-llvm-3.6.0}
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# run from third-party directory only
|
||||
@ -131,4 +136,4 @@ else
|
||||
}
|
||||
fi
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
15
makeParaView
15
makeParaView
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -26,7 +26,7 @@
|
||||
# makeParaView
|
||||
#
|
||||
# Description
|
||||
# Make and install paraview for version 3.14.1 and higher
|
||||
# Make and install paraview 4 or 5
|
||||
# - place the paraview source under $WM_THIRD_PARTY_DIR/ParaView-VERSION
|
||||
# (note capitalisation)
|
||||
#
|
||||
@ -107,8 +107,8 @@ The -no-FEATURE option can be disable these features (if not already disabled):
|
||||
|
||||
CMake options start with a capital letter and contain an '='.
|
||||
For example,
|
||||
$Script BUILD_TESTING=ON PARAVIEW_GENERATE_PROXY_DOCUMENTATION=OFF
|
||||
to add tests and avoid building documentation
|
||||
$Script BUILD_TESTING=ON
|
||||
to add tests
|
||||
|
||||
For finer control, the build stages can be selected or deselected individually:
|
||||
-config -no-config
|
||||
@ -146,6 +146,7 @@ setVersion
|
||||
#
|
||||
unset runCONFIG runMAKE runINSTALL
|
||||
runDEFAULT=true
|
||||
buildType=Release
|
||||
|
||||
# parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
@ -270,6 +271,11 @@ do
|
||||
export ParaView_MAJOR="$2"
|
||||
shift 2
|
||||
;;
|
||||
-buildType)
|
||||
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
|
||||
buildType="$2"
|
||||
shift 2
|
||||
;;
|
||||
*)
|
||||
usage "unknown option/argument: '$*'"
|
||||
;;
|
||||
@ -317,6 +323,7 @@ Version information
|
||||
qt ${QtVersion:-none}
|
||||
version ${ParaView_VERSION:-unknown}
|
||||
major ${ParaView_MAJOR:-unknown}
|
||||
build ${buildType:-Release}
|
||||
$(checkVersion)
|
||||
---------------------
|
||||
SUMMARY
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -23,10 +23,10 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# Script
|
||||
# makeParaView
|
||||
# makeParaView3
|
||||
#
|
||||
# Description
|
||||
# Make and install paraview
|
||||
# Make and install paraview for version 3.14.1 and higher
|
||||
# - place the paraview source under $WM_THIRD_PARTY_DIR/ParaView-VERSION
|
||||
# (note capitalisation)
|
||||
#
|
||||
@ -40,7 +40,7 @@ wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
|
||||
exit 1
|
||||
}
|
||||
. etc/tools/ThirdPartyFunctions
|
||||
. etc/tools/ParaView4Functions
|
||||
. etc/tools/ParaView3Functions
|
||||
#------------------------------------------------------------------------------
|
||||
#
|
||||
# USER OPTIONS:
|
||||
@ -107,8 +107,8 @@ The -no-FEATURE option can be disable these features (if not already disabled):
|
||||
|
||||
CMake options start with a capital letter and contain an '='.
|
||||
For example,
|
||||
$Script BUILD_TESTING=ON
|
||||
to add tests
|
||||
$Script BUILD_TESTING=ON PARAVIEW_GENERATE_PROXY_DOCUMENTATION=OFF
|
||||
to add tests and avoid building documentation
|
||||
|
||||
For finer control, the build stages can be selected or deselected individually:
|
||||
-config -no-config
|
||||
@ -146,7 +146,6 @@ setVersion
|
||||
#
|
||||
unset runCONFIG runMAKE runINSTALL
|
||||
runDEFAULT=true
|
||||
buildType=Release
|
||||
|
||||
# parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
@ -271,11 +270,6 @@ do
|
||||
export ParaView_MAJOR="$2"
|
||||
shift 2
|
||||
;;
|
||||
-buildType)
|
||||
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
|
||||
buildType="$2"
|
||||
shift 2
|
||||
;;
|
||||
*)
|
||||
usage "unknown option/argument: '$*'"
|
||||
;;
|
||||
@ -323,7 +317,6 @@ Version information
|
||||
qt ${QtVersion:-none}
|
||||
version ${ParaView_VERSION:-unknown}
|
||||
major ${ParaView_MAJOR:-unknown}
|
||||
build ${buildType:-Release}
|
||||
$(checkVersion)
|
||||
---------------------
|
||||
SUMMARY
|
||||
@ -334,4 +327,5 @@ SUMMARY
|
||||
|
||||
echo
|
||||
echo Done
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
Reference in New Issue
Block a user