From 9340ce223a54eab5ab764e35379ea7fc0c30bae1 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Tue, 9 Aug 2016 16:00:09 -0600
Subject: [PATCH] build: clean up request for C++11. require cmake 3.1 (which
 introduced CMAKE_CXX_STANDARD)

---
 CMakeLists.txt         | 8 +++++---
 bspinfo/CMakeLists.txt | 2 +-
 bsputil/CMakeLists.txt | 2 +-
 light/CMakeLists.txt   | 8 +-------
 man/CMakeLists.txt     | 2 +-
 qbsp/CMakeLists.txt    | 2 +-
 vis/CMakeLists.txt     | 2 +-
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f9c986d..c271ca9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (tyrutils)
 
 # Grab the git describe output and store it in GIT_DESCRIBE
@@ -43,8 +43,10 @@ if (UNIX)
 	add_definitions(-DLINUX)
 endif (UNIX)
 
-set (CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
-set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
+# set our C/C++ dialects
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_C_STANDARD 99)
 
 add_definitions(-DTYRUTILS_VERSION=${GIT_DESCRIBE})
 
diff --git a/bspinfo/CMakeLists.txt b/bspinfo/CMakeLists.txt
index 11a57f81..484b9303 100644
--- a/bspinfo/CMakeLists.txt
+++ b/bspinfo/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (bspinfo)
 
 set(BSPINFO_SOURCES
diff --git a/bsputil/CMakeLists.txt b/bsputil/CMakeLists.txt
index 91e4f9a3..39989032 100644
--- a/bsputil/CMakeLists.txt
+++ b/bsputil/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (bsputil)
 
 set(BSPUTIL_SOURCES
diff --git a/light/CMakeLists.txt b/light/CMakeLists.txt
index 813e7dcf..55a87ca8 100644
--- a/light/CMakeLists.txt
+++ b/light/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (light CXX C)
 
 set(LIGHT_INCLUDES
@@ -42,12 +42,6 @@ endif(embree_FOUND)
 
 add_executable(light ${LIGHT_SOURCES})
 target_link_libraries (light ${CMAKE_THREAD_LIBS_INIT})
-#set_property(TARGET light PROPERTY CXX_STANDARD 11)
-#set_property(TARGET light PROPERTY CXX_STANDARD_REQUIRED ON)
-#set_property(TARGET light PROPERTY C_STANDARD 99)
-
-#set (CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
-#set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
 
 if (embree_FOUND)
 	target_link_libraries (light ${EMBREE_LIBRARY})
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index e8b0b465..83e97c6f 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (man)
 
 find_program (GROFF groff)
diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt
index ec47b91a..b4457476 100644
--- a/qbsp/CMakeLists.txt
+++ b/qbsp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (qbsp CXX C)
 
 set(QBSP_INCLUDES
diff --git a/vis/CMakeLists.txt b/vis/CMakeLists.txt
index 679d113d..b68e7bef 100644
--- a/vis/CMakeLists.txt
+++ b/vis/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (vis)
 
 set(VIS_INCLUDES