Move declaration of c++14 standard

buildconfig/CMake/CommonSetup.cmake

@@ -241,6 +241,12 @@ if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
   include ( LinuxSetup )
 endif ()
 
+###########################################################################
+# Set the c++ standard to 14 - cmake should do the right thing with msvc
+###########################################################################
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 ###########################################################################
 # Add compiler options if using gcc
 ###########################################################################

buildconfig/CMake/GNUSetup.cmake

@@ -96,10 +96,7 @@ if(WITH_UBSAN)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SAN_FLAGS}" )
 endif()
 
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# XCode isn't picking up the standard set above.
+# XCode isn't picking up the c++ standard by CMAKE_CXX_STANDARD
 if(CMAKE_GENERATOR STREQUAL Xcode)
   set ( CMAKE_XCODE_ATTRIBUTE_OTHER_CPLUSPLUSFLAGS "${GNUFLAGS} -Woverloaded-virtual -fno-operator-names")
   set ( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")