From c461ad8fc96a1a177f206af3901fd4e34f20c93e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 5 Jun 2008 11:50:01 +0200
Subject: [PATCH] made ccm26ToFoam build conditional on ThirdParty library

---
 .../utilities/mesh/conversion/Optional/Allwmake       | 11 +++++++++++
 .../mesh/conversion/Optional/ccm26ToFoam/Allwmake     |  4 ----
 .../Optional/ccm26ToFoam/{ccm26ToFoam => }/Make/files |  0
 .../ccm26ToFoam/{ccm26ToFoam => }/Make/options        |  9 +++++----
 .../ccm26ToFoam/{ccm26ToFoam => }/ccm26ToFoam.C       |  0
 5 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100755 applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake
 rename applications/utilities/mesh/conversion/Optional/ccm26ToFoam/{ccm26ToFoam => }/Make/files (100%)
 rename applications/utilities/mesh/conversion/Optional/ccm26ToFoam/{ccm26ToFoam => }/Make/options (53%)
 rename applications/utilities/mesh/conversion/Optional/ccm26ToFoam/{ccm26ToFoam => }/ccm26ToFoam.C (100%)

diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index e69de29bb2..008c5cf8c4 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Build optional components (eg, may depend on third-party libraries)
+set -x
+
+# if the library exists, assume there are headers too
+if [ -e $FOAM_LIBBIN/libccmio.so ]
+then
+   wmake ccm26ToFoam
+fi
+
+# end
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake
deleted file mode 100755
index c37eb78a66..0000000000
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -x
-
-wmake ccm26ToFoam
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/files b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/files
similarity index 100%
rename from applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/files
rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/files
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
similarity index 53%
rename from applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options
rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
index 061793379c..9ec0ccab03 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options
@@ -1,11 +1,12 @@
+thirdParty=$(WM_PROJECT_INST_DIR)/ThirdParty
+
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/other/libccmio \
-    -I$(LIB_SRC)/other/libccmio/libccmio/lnInclude
+    -I$(thirdParty)/libccmio \
+    -I$(thirdParty)/libccmio/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lccmio \
-    -ladf
+    -lccmio
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
similarity index 100%
rename from applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/ccm26ToFoam.C
rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C