From aeec20b8a3315e9c4cabd450f3cf95cf301f064d Mon Sep 17 00:00:00 2001 From: "Maintenance team (INV)" Date: Fri, 27 Nov 2015 21:42:41 +0300 Subject: [PATCH] Synchronize adm files --- .../cmake_files/SalomeSetupPlatform.cmake | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake b/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake index 6d8fbf1d2..aa6b80e11 100755 --- a/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake +++ b/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake @@ -166,16 +166,18 @@ IF(NOT WIN32) ENDIF() ENDIF() -# C++11 support -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) +IF(NOT NO_CXX11_SUPPORT) + # C++11 support + 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) MESSAGE(STATUS "Enable C++11 support") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -ELSEIF(COMPILER_SUPPORTS_CXX0X) + ELSEIF(COMPILER_SUPPORTS_CXX0X) MESSAGE(STATUS "Enable C++0x support") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -ELSE() + ELSE() MESSAGE(WARNING "Compiler ${CMAKE_CXX_COMPILER} has no C++11 support.") + ENDIF() ENDIF() -- 2.39.2