Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #146 from bveldhoen/upgradeToUASDK1.7.1
Enabled c++11.
  • Loading branch information
bveldhoen committed Nov 12, 2019
2 parents 6fddb7c + 4be272e commit d26dac2
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/UafMacros.cmake
Expand Up @@ -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)
Expand Down

0 comments on commit d26dac2

Please sign in to comment.