diff --git a/applications/utilities/mesh/conversion/Optional/AllwmakeOptional b/applications/utilities/mesh/conversion/Optional/AllwmakeOptional index c43beaf5bb31b768e028de8910a9548acf9eda03..7bc282cf426792528be2f94ce422764b5ee107ba 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 d10f04194a95c23f4a6f600386f96b021dcb605a..b999b0d456573edb265b42e45e64af1edcb93849 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