Merge branch 'master' of github.com:MDjur/covise

Author: MDjur

cmake/CoviseGlobalFeatureTests.cmake

@@ -15,7 +15,6 @@ ELSE(COVISE_SYS_BIGENDIAN)
 ENDIF(COVISE_SYS_BIGENDIAN)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
    include(CheckCXXCompilerFlag)
    check_cxx_compiler_flag("-Wno-stdlibcxx-not-found" have_wno_stdlibcxx_not_found)
    if(${have_wno_stdlibcxx_not_found})
@@ -24,7 +23,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-command-line-argument")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument")
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 endif()

cmake/CoviseHelperMacros.cmake

@@ -1147,10 +1147,6 @@ MACRO(COVISE_FIND_CUDA)
       set(CUDA_FOUND TRUE)
       set(CUDA_PROPAGATE_HOST_FLAGS ON)
       if(NOT WIN32)
-          # nvcc aborts compilation if -std was defined more than once
-          if ("${CMAKE_VERSION}" VERSION_LESS "3.3.0")
-              set(CUDA_NVCC_FLAGS "-std=c++11 ${CUDA_NVCC_FLAGS}")
-          endif()
           if ((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
               set(CUDA_NVCC_FLAGS "-g ${CUDA_NVCC_FLAGS}")
           endif()

cmake/CovisePresets.cmake

@@ -204,7 +204,6 @@ IF(NOT COVISE_CONFIGURED_ONCE)
   # SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING "Flags used by the compiler during all build types" FORCE)
 
   IF(CMAKE_COMPILER_IS_GNUCC)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" CACHE STRING "Flags used by the compiler during all build types" FORCE)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined"
        CACHE STRING "Flags used by the linker for shared objects" FORCE)
   ENDIF()

scripts/cuda-host-compiler

@@ -7,7 +7,6 @@
 #COVISE_UNFINISHED()
 
 PROJECT(OpenCOVER C CXX)
-# this is already set in the top most CMakeLists.txt set (CMAKE_CXX_STANDARD 11)
 set(COVISE_BUILDING_COVER TRUE)
 
 option(COVER_ENABLE_VOIP "Enable VoIP linphone client plugin" OFF)

src/OpenCOVER/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories ("../../include/cpp0x")
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif (NOT CMAKE_BUILD_TYPE)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
 file (GLOB benchmark_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 foreach (benchmark_source ${benchmark_sources})

src/OpenCOVER/DrivingSim/gaalet/cpp0x/benchmarks/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories ("../../../include/cpp0x")
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif (NOT CMAKE_BUILD_TYPE)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
 find_package(OpenSceneGraph REQUIRED osg osgViewer osgGA osgDB)
 include_directories (${OPENSCENEGRAPH_INCLUDE_DIRS})

src/OpenCOVER/DrivingSim/gaalet/cpp0x/examples/CarDynamics/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories ("../../../include/cpp0x")
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif (NOT CMAKE_BUILD_TYPE)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
 find_package(OpenSceneGraph REQUIRED osg osgViewer osgGA osgDB)
 include_directories (${OPENSCENEGRAPH_INCLUDE_DIRS})

src/OpenCOVER/DrivingSim/gaalet/cpp0x/examples/CarDynamicsCGA/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories ("../../../include/cpp0x")
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif (NOT CMAKE_BUILD_TYPE)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
 find_package(OpenSceneGraph REQUIRED osg osgViewer osgGA)
 include_directories (${OPENSCENEGRAPH_INCLUDE_DIRS})

src/OpenCOVER/DrivingSim/gaalet/cpp0x/examples/ClosedLoopKinematics/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories ("../../../include/cpp0x")
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif (NOT CMAKE_BUILD_TYPE)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
 find_package(OpenSceneGraph REQUIRED osg osgViewer osgGA)
 include_directories (${OPENSCENEGRAPH_INCLUDE_DIRS})