From fdc798d02b1822cc78db6d828ab932ab50ea5154 Mon Sep 17 00:00:00 2001 From: cfcohen Date: Fri, 4 Dec 2015 20:27:18 -0500 Subject: [PATCH] Fix minor problem with extern/poshlib not being c++ at all, so -std=c++11 is not a valid option. A cmake 2.8.0 compatible approach that involves CMAKE_CXX_FLAGS causes problems for the CUDA compressor module that _cannot_ accept -std=c++11. This approach seems the most correct, but I'm new to CMake, so there may be a better solution. --- CMakeLists.txt | 7 +------ src/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a1783f..3a53956 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,10 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) PROJECT(NV) ENABLE_TESTING() SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake") SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}") -# GCC check (needs -std:c++11 flag) -if(CMAKE_COMPILER_IS_GNUCC) - ADD_DEFINITIONS("-std=c++11") -ENDIF(CMAKE_COMPILER_IS_GNUCC) - IF(WIN32) # gnuwin32 paths: SET(GNUWIN32_PATH "${NV_SOURCE_DIR}/extern/gnuwin32") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c16a590..6d623fa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,6 +3,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${NV_SOURCE_DIR}/extern/poshlib) INCLUDE_DIRECTORIES(${NV_SOURCE_DIR}/extern/stb) +if(CMAKE_COMPILER_IS_GNUCC) + ADD_COMPILE_OPTIONS(-std=c++11) +ENDIF(CMAKE_COMPILER_IS_GNUCC) + SUBDIRS(nvcore) SUBDIRS(nvmath) SUBDIRS(nvimage)