olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: clean up request for C++11. require cmake 3.1 (which introduced CMAKE_CXX_STANDARD)

This commit is contained in:
Eric Wasylishen 2016-08-09 16:00:09 -06:00
parent 637f3e4c1f
commit 9340ce223a
7 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 3.1)
project (tyrutils) project (tyrutils)
# Grab the git describe output and store it in GIT_DESCRIBE # Grab the git describe output and store it in GIT_DESCRIBE
@ -43,8 +43,10 @@ if (UNIX)
add_definitions(-DLINUX) add_definitions(-DLINUX)
endif (UNIX) endif (UNIX)
set (CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}") # set our C/C++ dialects
set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_C_STANDARD 99)
add_definitions(-DTYRUTILS_VERSION=${GIT_DESCRIBE}) add_definitions(-DTYRUTILS_VERSION=${GIT_DESCRIBE})

2
bspinfo/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 3.1)
project (bspinfo) project (bspinfo)
set(BSPINFO_SOURCES set(BSPINFO_SOURCES

2
bsputil/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 3.1)
project (bsputil) project (bsputil)
set(BSPUTIL_SOURCES set(BSPUTIL_SOURCES

8
light/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 3.1)
project (light CXX C) project (light CXX C)
set(LIGHT_INCLUDES set(LIGHT_INCLUDES
@ -42,12 +42,6 @@ endif(embree_FOUND)
add_executable(light ${LIGHT_SOURCES}) add_executable(light ${LIGHT_SOURCES})
target_link_libraries (light ${CMAKE_THREAD_LIBS_INIT}) 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) if (embree_FOUND)
target_link_libraries (light ${EMBREE_LIBRARY}) target_link_libraries (light ${EMBREE_LIBRARY})

2
man/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 3.1)
project (man) project (man)
find_program (GROFF groff) find_program (GROFF groff)

2
qbsp/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 3.1)
project (qbsp CXX C) project (qbsp CXX C)
set(QBSP_INCLUDES set(QBSP_INCLUDES

2
vis/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 3.1)
project (vis) project (vis)
set(VIS_INCLUDES set(VIS_INCLUDES