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.
pull/231/head
cfcohen 9 years ago
parent 4c860bf84b
commit fdc798d02b

@ -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")

@ -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)

Loading…
Cancel
Save