From 64898349be352635dbf9ef70be6dcfc3fce17a5e Mon Sep 17 00:00:00 2001
From: Jaime Arias <arias@lipn.univ-paris13.fr>
Date: Thu, 14 May 2020 14:22:28 +0200
Subject: [PATCH] refactor: add c++17 standard to project and c++14 to sylvan
---
CMakeLists.txt | 11 ++++++++---
src/CMakeLists.txt | 2 +-
third-party/sylvan | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e802ac..746dbc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,17 @@
# set minimum cmake version
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
# project name and language
project(pmc-sog C CXX)
-# compiler flags
+# C++17 standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Add compiler flags
if(CMAKE_COMPILER_IS_GNUCC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -std=c++17")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
endif()
# add pn parser
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c44274..89b6a20 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
# set minimum cmake version
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
# include MPI
find_package(MPI REQUIRED)
diff --git a/third-party/sylvan b/third-party/sylvan
index 7184c4a..97208c7 160000
--- a/third-party/sylvan
+++ b/third-party/sylvan
@@ -1 +1 @@
-Subproject commit 7184c4aede8b1d95c33442862075b37f9eaae899
+Subproject commit 97208c7f528f08a91afa99da0d43c6734d36cfa4
--
GitLab