diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 71f7102b..e1b6bb45 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -116,18 +116,17 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") #add_definitions(-Wall) add_definitions(-Werror=format-security) add_definitions(-Werror=format) + + # Compiler check (needs -std=c++11 flag) include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) - CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) if(COMPILER_SUPPORTS_CXX11) set(CMAKE_CXX_STANDARD 11) - elseif(COMPILER_SUPPORTS_CXX0X) - set(CMAKE_CXX_STANDARD 0x) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) else() message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") endif() - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) if(CPU_TYPE) add_definitions(-DCPUSTRING="${CPU_TYPE}") diff --git a/neo/cmake-linux-debug-nosimd.sh b/neo/cmake-linux-debug-nosimd.sh old mode 100644 new mode 100755 diff --git a/neo/cmake-linux-release-nosimd.sh b/neo/cmake-linux-release-nosimd.sh old mode 100644 new mode 100755 diff --git a/neo/idlib/sys/sys_defines.h b/neo/idlib/sys/sys_defines.h index 5163a1a9..71318f55 100644 --- a/neo/idlib/sys/sys_defines.h +++ b/neo/idlib/sys/sys_defines.h @@ -113,7 +113,7 @@ If you have questions concerning this license or the applicable additional terms #define CPUSTRING "e2k" #elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64) #define CPUSTRING "aarch64" - #else + #else #error unknown CPU #endif #endif