SW-154: Added _2018 to the CXX names.

CMake/variants/GNUCXX11_2018.cmake

@@ -10,38 +10,38 @@ set(LOFAR_COMPILER_SUITES GNUCXX11_2018)
 set(LOFAR_BUILD_VARIANTS DEBUG OPT OPT3 OPTARCH)
 
 # GNU compiler suite
-set(GNUCXX11_COMPILERS GNUCXX11_C GNUCXX11_CXX GNUCXX11_Fortran GNUCXX11_ASM)
-set(GNUCXX11_C          /opt/rh/devtoolset-6/root/usr/bin/gcc)      # GNU C compiler
-set(GNUCXX11_CXX        /opt/rh/devtoolset-6/root/usr/bin/g+)       # GNU C+ compiler
-set(GNUCXX11_Fortran    /opt/rh/devtoolset-6/root/usr/bin/gfortran) # GNU Fortran compiler
-set(GNUCXX11_ASM        /opt/rh/devtoolset-6/root/usr/bin/gcc)      # GNU assembler
+set(GNUCXX11_2018_COMPILERS GNUCXX11_2018_C GNUCXX11_2018_CXX GNUCXX11_2018_Fortran GNUCXX11_2018_ASM)
+set(GNUCXX11_2018_C          /opt/rh/devtoolset-6/root/usr/bin/gcc)      # GNU C compiler
+set(GNUCXX11_2018_CXX        /opt/rh/devtoolset-6/root/usr/bin/g+)       # GNU C+ compiler
+set(GNUCXX11_2018_Fortran    /opt/rh/devtoolset-6/root/usr/bin/gfortran) # GNU Fortran compiler
+set(GNUCXX11_2018_ASM        /opt/rh/devtoolset-6/root/usr/bin/gcc)      # GNU assembler
 
-set(GNUCXX11_C_FLAGS          "-W -Wall -Wno-unknown-pragmas")
-set(GNUCXX11_C_FLAGS_DEBUG    "-g")
-set(GNUCXX11_C_FLAGS_OPT      "-g -O2")
-set(GNUCXX11_C_FLAGS_OPT3     "-g -O3")
-set(GNUCXX11_C_FLAGS_OPTARCH  "-g -O3 -march=native")
-set(GNUCXX11_CXX_FLAGS        "-std=c+11 -W -Wall -Woverloaded-virtual -Wno-unknown-pragmas -D_GLIBCXX_USE_CXX11_ABI=0")
-set(GNUCXX11_CXX_FLAGS_DEBUG  "-g")
-set(GNUCXX11_CXX_FLAGS_OPT    "-g -O2")
-set(GNUCXX11_CXX_FLAGS_OPT3   "-g -O3")
-set(GNUCXX11_CXX_FLAGS_OPTARCH "-g -O3 -march=native")
-set(GNUCXX11_EXE_LINKER_FLAGS)
-set(GNUCXX11_EXE_LINKER_FLAGS_DEBUG)
-set(GNUCXX11_EXE_LINKER_FLAGS_OPT)
-set(GNUCXX11_EXE_LINKER_FLAGS_OPT3)
-set(GNUCXX11_EXE_LINKER_FLAGS_OPTARCH)
-set(GNUCXX11_SHARED_LINKER_FLAGS)
-set(GNUCXX11_SHARED_LINKER_FLAGS_DEBUG)
-set(GNUCXX11_SHARED_LINKER_FLAGS_OPT)
-set(GNUCXX11_SHARED_LINKER_FLAGS_OPT3)
-set(GNUCXX11_SHARED_LINKER_FLAGS_OPTARCH)
-set(GNUCXX11_COMPILE_DEFINITIONS)
-set(GNUCXX11_COMPILE_DEFINITIONS_DEBUG
+set(GNUCXX11_2018_C_FLAGS          "-W -Wall -Wno-unknown-pragmas")
+set(GNUCXX11_2018_C_FLAGS_DEBUG    "-g")
+set(GNUCXX11_2018_C_FLAGS_OPT      "-g -O2")
+set(GNUCXX11_2018_C_FLAGS_OPT3     "-g -O3")
+set(GNUCXX11_2018_C_FLAGS_OPTARCH  "-g -O3 -march=native")
+set(GNUCXX11_2018_CXX_FLAGS        "-std=c+11 -W -Wall -Woverloaded-virtual -Wno-unknown-pragmas -D_GLIBCXX_USE_CXX11_ABI=0")
+set(GNUCXX11_2018_CXX_FLAGS_DEBUG  "-g")
+set(GNUCXX11_2018_CXX_FLAGS_OPT    "-g -O2")
+set(GNUCXX11_2018_CXX_FLAGS_OPT3   "-g -O3")
+set(GNUCXX11_2018_CXX_FLAGS_OPTARCH "-g -O3 -march=native")
+set(GNUCXX11_2018_EXE_LINKER_FLAGS)
+set(GNUCXX11_2018_EXE_LINKER_FLAGS_DEBUG)
+set(GNUCXX11_2018_EXE_LINKER_FLAGS_OPT)
+set(GNUCXX11_2018_EXE_LINKER_FLAGS_OPT3)
+set(GNUCXX11_2018_EXE_LINKER_FLAGS_OPTARCH)
+set(GNUCXX11_2018_SHARED_LINKER_FLAGS)
+set(GNUCXX11_2018_SHARED_LINKER_FLAGS_DEBUG)
+set(GNUCXX11_2018_SHARED_LINKER_FLAGS_OPT)
+set(GNUCXX11_2018_SHARED_LINKER_FLAGS_OPT3)
+set(GNUCXX11_2018_SHARED_LINKER_FLAGS_OPTARCH)
+set(GNUCXX11_2018_COMPILE_DEFINITIONS)
+set(GNUCXX11_2018_COMPILE_DEFINITIONS_DEBUG
                          "-DLOFAR_DEBUG -DENABLE_DBGASSERT -DENABLE_TRACER")
-set(GNUCXX11_COMPILE_DEFINITIONS_OPT)
-set(GNUCXX11_COMPILE_DEFINITIONS_OPT3
+set(GNUCXX11_2018_COMPILE_DEFINITIONS_OPT)
+set(GNUCXX11_2018_COMPILE_DEFINITIONS_OPT3
                          "-DNDEBUG -DDISABLE_DEBUG_OUTPUT")
-set(GNUCXX11_COMPILE_DEFINITIONS_OPTARCH
+set(GNUCXX11_2018_COMPILE_DEFINITIONS_OPTARCH
                          "-DNDEBUG -DDISABLE_DEBUG_OUTPUT")