FEATURE: Bugfix for nextRelease 3rd Party and foamToEnsight. Author: Martin Beaudoin. Merge: Dominik Christ.
This commit is contained in:
Dominik Christ
commit
f6c053d14c
6 changed files with 13 additions and 10 deletions
2
ThirdParty/AllMake.stage1
vendored
2
ThirdParty/AllMake.stage1
vendored
|
|
@ -120,7 +120,7 @@ echo
|
|||
|
||||
# m4 1.4.16
|
||||
#
|
||||
[ ! -z "$WM_THIRD_PARTY_USE_M4_146" ] && {
|
||||
[ ! -z "$WM_THIRD_PARTY_USE_M4_1416" ] && {
|
||||
echo "Building m4 1.4.16"
|
||||
# You need a recent version of m4 in order to compile a recent version of bison
|
||||
( rpm_make -p m4-1.4.16 -s m4-1.4.16.spec -u http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz )
|
||||
|
|
|
|||
11
ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0
vendored
11
ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0
vendored
|
|
@ -1,6 +1,6 @@
|
|||
diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib scotch_6.0.4/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib
|
||||
--- scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 2015-06-01 23:50:39.279536328 -0400
|
||||
+++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 2015-06-21 00:25:43.250993194 -0400
|
||||
@@ -0,0 +1,22 @@
|
||||
+EXE =
|
||||
+LIB = .dylib
|
||||
|
|
@ -26,8 +26,8 @@ diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib sc
|
|||
+YACC = bison -y
|
||||
diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib
|
||||
--- scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2014-08-05 08:56:17.000000000 -0400
|
||||
+++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2015-06-01 23:58:05.463559948 -0400
|
||||
@@ -8,8 +8,8 @@
|
||||
+++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2015-06-21 00:26:43.072992194 -0400
|
||||
@@ -8,10 +8,10 @@
|
||||
CAT = cat
|
||||
CCS = gcc
|
||||
CCP = mpicc
|
||||
|
|
@ -36,5 +36,8 @@ diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotc
|
|||
+CCD = mpicc -I$(MPI_HOME)/include
|
||||
+CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed
|
||||
CLIBFLAGS = -shared -fPIC
|
||||
LDFLAGS = -lz -lm -pthread
|
||||
-LDFLAGS = -lz -lm -pthread
|
||||
+LDFLAGS = -lz -lm -pthread -lrt
|
||||
CP = cp
|
||||
LEX = flex -Pscotchyy -olex.yy.c
|
||||
LN = ln
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved.
|
|||
Still, I recommand always checking that these two important files are up-to-date:
|
||||
|
||||
cp ../CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR
|
||||
cp ../CMakeFiles/CTestConfig.cmake.openfoam-extend $WM_PROJECT_DIR/CTestConfig.cmake
|
||||
cp ../CMakeFiles/CTestConfig.cmake.foam-extend $WM_PROJECT_DIR/CTestConfig.cmake
|
||||
|
||||
|
||||
7: Next, running the test loop is pretty simple:
|
||||
|
|
@ -51,7 +51,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved.
|
|||
./Allrun_Experimental
|
||||
|
||||
|
||||
8: The results will be published on the CDash dashboard on openfoam-extend.
|
||||
8: The results will be published on the CDash dashboard on foam-extend.
|
||||
|
||||
To see your results:
|
||||
URL : http://foam-extend.sourceforge.net/CDash/index.php?project=foam-extend-3.2
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ if [ ! -e $WM_PROJECT_DIR/CTestConfig.cmake ]
|
|||
then
|
||||
echo "Warning:"
|
||||
echo " Missing file: CTestConfig.cmake under \$WM_PROJECT_DIR. Stopping."
|
||||
echo " A copy of CTestConfig.cmake for openfoam-extend is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles."
|
||||
echo " A copy of CTestConfig.cmake for foam-extend is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles."
|
||||
echo " For a copy of CTestConfig.cmake for your local CDash server, contact your local CDash admin."
|
||||
echo " Please make a copy of this file under \$WM_PROJECT_DIR/CTestConfig.cmake."
|
||||
exit -1
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ if [ ! -e $WM_PROJECT_DIR/CTestConfig.cmake ]
|
|||
then
|
||||
echo "Warning:"
|
||||
echo " Missing file: CTestConfig.cmake under \$WM_PROJECT_DIR. Stopping."
|
||||
echo " A copy of CTestConfig.cmake for openfoam-extend is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles."
|
||||
echo " A copy of CTestConfig.cmake for foam-extend is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles."
|
||||
echo " For a copy of CTestConfig.cmake for your local CDash server, contact your local CDash admin."
|
||||
echo " Please make a copy of this file under \$WM_PROJECT_DIR/CTestConfig.cmake."
|
||||
exit -1
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ if [ ! -e $WM_PROJECT_DIR/CTestConfig.cmake ]
|
|||
then
|
||||
echo "Warning:"
|
||||
echo " Missing file: CTestConfig.cmake under \$WM_PROJECT_DIR. Stopping."
|
||||
echo " A copy of CTestConfig.cmake for openfoam-extend is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles."
|
||||
echo " A copy of CTestConfig.cmake for foam-extend is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles."
|
||||
echo " For a copy of CTestConfig.cmake for your local CDash server, contact your local CDash admin."
|
||||
echo " Please make a copy of this file under \$WM_PROJECT_DIR/CTestConfig.cmake."
|
||||
exit -1
|
||||
|
|
|
|||
Reference in a new issue