summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@debian.org>2020-05-27 16:44:24 -0700
committerManoj Srivastava <srivasta@debian.org>2020-05-27 16:45:26 -0700
commit2c93afb0089a37de798da8d23824a84846ab7d7c (patch)
treea53be684627948ed96d64e2be7aac1bea83507b8 /CMakeLists.txt
parentd6b913d3ca2e84b75f3675fd6e9f5246c100cf27 (diff)
parente9d08c617ee73f0636e1f1a1d40582f193c37e81 (diff)
Merge branch 'upstream'
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt23
1 files changed, 8 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e56e4c33..f83d0018 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)
@@ -9,6 +9,11 @@ INCLUDE(FeatureSummary)
INCLUDE(FindPkgConfig)
#
+# C++ standard
+#
+SET(CMAKE_CXX_STANDARD 17)
+
+#
# Basic common compiler flags.
#
SET(COMMON_COMPILER_FLAGS "-pipe -Wall -Wextra -Wno-unused-value -Wno-unused-parameter")
@@ -28,7 +33,8 @@ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
#
# 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 -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
@@ -77,19 +83,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)
#
FIND_PACKAGE(Curses)