From 5ba71dd9fc92088d08272b56dbd6ae1b966b48fe Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Sun, 8 Jun 2008 17:04:35 +0100
Subject: [PATCH] Simplified the download and building of libccmio-2.6.1.
Corrected the building of ccm26ToFoam. Tested on dm from download to run --
all fine. Needed to use --no-check-certificate option for wget.
---
.../utilities/mesh/conversion/Optional/AllwmakeOptional | 4 ++--
.../mesh/conversion/Optional/ccm26ToFoam/Make/options | 4 ++--
bin/{ => tools}/foamThirdParty | 0
3 files changed, 4 insertions(+), 4 deletions(-)
rename bin/{ => tools}/foamThirdParty (100%)
diff --git a/applications/utilities/mesh/conversion/Optional/AllwmakeOptional b/applications/utilities/mesh/conversion/Optional/AllwmakeOptional
index c43beaf5bb3..7bc282cf426 100755
--- a/applications/utilities/mesh/conversion/Optional/AllwmakeOptional
+++ b/applications/utilities/mesh/conversion/Optional/AllwmakeOptional
@@ -5,8 +5,8 @@ set -x
# if the library exists, assume there are headers too
if [ -e $FOAM_LIBBIN/libccmio.so ]
then
- $WM_PROJECT_DIR/../ThirdParty/AllwmakeCcmIO
- wmake ccm26ToFoam
+ ( cd $WM_PROJECT_DIR/../ThirdParty && ./AllwmakeLibccmio ) \
+ && wmake ccm26ToFoam
fi
# end
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
index d10f04194a9..b999b0d4565 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
@@ -1,8 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(THIRD_PARTY)/libccmio \
- -I$(THIRD_PARTY)/libccmio/lnInclude
+ -I${WM_PROJECT_DIR}/../ThirdParty/libccmio-2.6.1 \
+ -I${WM_PROJECT_DIR}/../ThirdParty/libccmio-2.6.1/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/bin/foamThirdParty b/bin/tools/foamThirdParty
similarity index 100%
rename from bin/foamThirdParty
rename to bin/tools/foamThirdParty
--
GitLab