From 4be272e328e9a00937c6babc1ede4e7f00d1d709 Mon Sep 17 00:00:00 2001 From: Bram Veldhoen Date: Tue, 12 Nov 2019 09:33:41 +0100 Subject: [PATCH] Enabled c++11. --- src/UafMacros.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/UafMacros.cmake b/src/UafMacros.cmake index 2fc528a..d23c8c7 100644 --- a/src/UafMacros.cmake +++ b/src/UafMacros.cmake @@ -78,21 +78,22 @@ ENDMACRO(setUnifiedAutomationSdkCompilerDir) MACRO(setUafCompilerFlags) if (WIN32) - set(CMAKE_CXX_FLAGS "/EHsc") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") if (BUILD_WITH_MULTIPLE_PROCESSES) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") endif (BUILD_WITH_MULTIPLE_PROCESSES) add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -DUNICODE -D_UNICODE -D_UA_STACK_USE_DLL) else (WIN32) if (FORCE32) - set(CMAKE_CXX_FLAGS "-Wall -Wno-unused-function -Wno-comment -m32 -Wno-maybe-uninitialized") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function -Wno-comment -m32 -Wno-maybe-uninitialized") else (FORCE32) - set(CMAKE_CXX_FLAGS "-Wall -Wno-unused-function -Wno-comment -Wno-maybe-uninitialized") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function -Wno-comment -Wno-maybe-uninitialized") endif (FORCE32) if (BUILD_WITH_MULTIPLE_PROCESSES) message(FATAL_ERROR "BUILD_WITH_MULTIPLE_PROCESSES is not allowed on this platform. Try 'make -j' instead, when compiling.") endif (BUILD_WITH_MULTIPLE_PROCESSES) endif (WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") ENDMACRO(setUafCompilerFlags)