diff --git a/etc/config/settings.csh b/etc/config/settings.csh index 91ebfdaabe..d37d5006e2 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -218,7 +218,25 @@ case ThirdParty: switch ("$WM_COMPILER") case Gcc: case Gcc48: - set gcc_version=gcc-4.8.3 + set gcc_version=gcc-4.8.4 + set gmp_version=gmp-5.1.2 + set mpfr_version=mpfr-3.1.2 + set mpc_version=mpc-1.0.1 + breaksw + case Gcc45: + set gcc_version=gcc-4.5.4 + set gmp_version=gmp-5.1.2 + set mpfr_version=mpfr-3.1.2 + set mpc_version=mpc-1.0.1 + breaksw + case Gcc46: + set gcc_version=gcc-4.6.4 + set gmp_version=gmp-5.1.2 + set mpfr_version=mpfr-3.1.2 + set mpc_version=mpc-1.0.1 + breaksw + case Gcc47: + set gcc_version=gcc-4.7.4 set gmp_version=gmp-5.1.2 set mpfr_version=mpfr-3.1.2 set mpc_version=mpc-1.0.1 @@ -229,6 +247,12 @@ case ThirdParty: set mpfr_version=mpfr-3.1.2 set mpc_version=mpc-1.0.1 breaksw + case Gcc50: + set gcc_version=gcc-5.0.0 + set gmp_version=gmp-5.1.2 + set mpfr_version=mpfr-3.1.2 + set mpc_version=mpc-1.0.1 + breaksw case Clang: # using clang - not gcc setenv WM_CC 'clang' diff --git a/etc/config/settings.sh b/etc/config/settings.sh index f1d3348424..f88391aab1 100644 --- a/etc/config/settings.sh +++ b/etc/config/settings.sh @@ -271,6 +271,12 @@ OpenFOAM | ThirdParty) mpfr_version=mpfr-3.1.2 mpc_version=mpc-1.0.1 ;; + Gcc50) + gcc_version=gcc-5.0.0 + gmp_version=gmp-5.1.2 + mpfr_version=mpfr-3.1.2 + mpc_version=mpc-1.0.1 + ;; Clang) # using clang - not gcc export WM_CC='clang' diff --git a/wmake/rules/General/coco-cpp b/wmake/rules/General/coco-cpp deleted file mode 100644 index 009c49e71e..0000000000 --- a/wmake/rules/General/coco-cpp +++ /dev/null @@ -1,12 +0,0 @@ -# handle Coco/R attributed grammars written for the C++ version -# http://www.ssw.uni-linz.ac.at/Coco/ -# http://github.com/olesenm/coco-cpp/ -# - -SUFFIXES += .atg - -atgtoo = \ - $(WM_THIRD_PARTY_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)/coco-cpp/bin/coco-cpp \ - -single \ - $< -o $(OBJECTS_DIR) && \ - $(CC) $(c++FLAGS) -c $(@D)/$(