From 20978b10d58070ae67bd729cce427b81dc0f355b Mon Sep 17 00:00:00 2001
From: Mohammed Das <das.mohammed@gmail.com>
Date: Mon, 27 Jun 2022 21:18:23 -0700
Subject: [PATCH 1/2] Remove c++11 as compilers have beyond it by default

---
 CMakeLists.txt       | 1 +
 cmake/emp-base.cmake | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9abb31..58a0657 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ set(NAME "emp-tool")
 
 set(CMAKE_FOLDER ./)
 include(${CMAKE_FOLDER}/cmake/emp-base.cmake)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} --std=c++11")
 
 IF(${CRYPTO_IN_CIRCUIT})
 ADD_CUSTOM_COMMAND(
diff --git a/cmake/emp-base.cmake b/cmake/emp-base.cmake
index d0a351b..2f1ae08 100644
--- a/cmake/emp-base.cmake
+++ b/cmake/emp-base.cmake
@@ -49,7 +49,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+simd+crypto+crc")
 ELSE(${CMAKE_SYSTEM_PROCESSOR} MATCHES "(aarch64)|(arm64)")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -maes -mrdseed")
 ENDIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "(aarch64)|(arm64)" )
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -std=c++11")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
+
 
 ## Build type
 if(NOT CMAKE_BUILD_TYPE)

From 2f07f08ad7569b0459275706dbcfa2b86e18b9ea Mon Sep 17 00:00:00 2001
From: Xiao Wang <wangxiao1254@gmail.com>
Date: Thu, 21 Jul 2022 11:56:40 -0500
Subject: [PATCH 2/2] add option to change default CMAKE_CXX_STANDARD

---
 CMakeLists.txt       | 1 -
 cmake/emp-base.cmake | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58a0657..d9abb31 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,6 @@ set(NAME "emp-tool")
 
 set(CMAKE_FOLDER ./)
 include(${CMAKE_FOLDER}/cmake/emp-base.cmake)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} --std=c++11")
 
 IF(${CRYPTO_IN_CIRCUIT})
 ADD_CUSTOM_COMMAND(
diff --git a/cmake/emp-base.cmake b/cmake/emp-base.cmake
index 2f1ae08..ee47400 100644
--- a/cmake/emp-base.cmake
+++ b/cmake/emp-base.cmake
@@ -52,6 +52,11 @@ ENDIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "(aarch64)|(arm64)" )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
 
+if(NOT CMAKE_CXX_STANDARD)
+set(CMAKE_CXX_STANDARD 11)
+endif(NOT CMAKE_CXX_STANDARD)
+message(STATUS "${Blue}CXX_STANDARD: ${CMAKE_CXX_STANDARD}${ColourReset}")
+
 
 ## Build type
 if(NOT CMAKE_BUILD_TYPE)