From d7533e931cfb49a68dc8e6e3f524d49e364cef83 Mon Sep 17 00:00:00 2001
From: Manoj Srivastava <srivasta@debian.org>
Date: Wed, 27 May 2020 16:31:00 -0700
Subject: New upstream version 2.41-ah~0.git.20200131

---
 CMakeLists.txt | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf31d878..7f265aef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Project definition.
 PROJECT (tome2)
-CMAKE_MINIMUM_REQUIRED (VERSION 3.1)
+CMAKE_MINIMUM_REQUIRED (VERSION 3.5)
 
 # We want a readable feature summary.
 INCLUDE(FeatureSummary)
@@ -8,6 +8,11 @@ INCLUDE(FeatureSummary)
 # pkg-config support
 INCLUDE(FindPkgConfig)
 
+#
+# C++ standard
+#
+SET(CMAKE_CXX_STANDARD 17)
+
 #
 # Basic common compiler flags.
 #
@@ -28,7 +33,8 @@ SET(CMAKE_C_FLAGS_DEBUG     "-O0 -g ${SANITIZER_FLAGS}")
 #
 # C++ Compiler Flags
 #
-SET(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${COMMON_COMPILER_FLAGS} --std=c++14")
+SET(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${COMMON_COMPILER_FLAGS}")
+SET(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -DJSONCONS_NO_DEPRECATED")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g ${SANITIZER_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
 
@@ -76,19 +82,6 @@ FIND_PACKAGE(X11)
 #
 FIND_PACKAGE(GTK2)
 
-#
-# SDL support (OPTIONAL)
-#
-FIND_PACKAGE(SDL)
-IF(SDL_FOUND)
-  # We assume that if we want to compile for SDL that
-  # any required dependencies should be installed.
-  FIND_PACKAGE(SDL_image)
-  FIND_PACKAGE(SDL_ttf)
-  SET_PACKAGE_PROPERTIES(SDL_image PROPERTIES TYPE REQUIRED)
-  SET_PACKAGE_PROPERTIES(SDL_ttf PROPERTIES TYPE REQUIRED)
-ENDIF()
-
 #
 # Curses support (OPTIONAL)
 #
-- 
cgit v1.2.3