casa-mp-base

--- CMakeLists.txt.orig 2018-08-29 01:07:15.000000000 -0700

+++ CMakeLists.txt  2018-10-29 12:34:10.000000000 -0700

@@ -991,7 +991,7 @@

         #C4706 assignment within conditional expression

         #C4589: Constructor of abstract class 'osgGA::CameraManipulator' ignores initializer for virtual base class 'osg::Object'

         SET(OSG_AGGRESSIVE_WARNING_FLAGS /W4 /wd4589 /wd4706 /wd4127 /wd4100)

-ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")

         SET(OSG_AGGRESSIVE_WARNING_FLAGS  -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -Wno-overloaded-virtual)

         # CMake lacks an elseif, so other non-gcc, non-VS compilers need

@@ -1002,25 +1002,17 @@

             SET(OSG_CXX_LANGUAGE_STANDARD "C++11" CACHE STRING "set the c++ language standard (C++98 / GNU++98 / C++11) for OSG" )

             MARK_AS_ADVANCED(OSG_CXX_LANGUAGE_STANDARD)

             # remove existing flags

-            REMOVE_CXX_FLAG(-std=c++98)

-            REMOVE_CXX_FLAG(-std=gnu++98)

-            REMOVE_CXX_FLAG(-std=c++11)

-            REMOVE_CXX_FLAG(-stdlib=libstdc++)

-            REMOVE_CXX_FLAG(-stdlib=libc++)

             IF(${OSG_CXX_LANGUAGE_STANDARD} STREQUAL "c++98" OR ${OSG_CXX_LANGUAGE_STANDARD} STREQUAL "C++98")

                 set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")

-                set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libstdc++")

-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -stdlib=libstdc++")

+                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")

             ELSE()

                 IF(${OSG_CXX_LANGUAGE_STANDARD} STREQUAL "gnu++98" OR ${OSG_CXX_LANGUAGE_STANDARD} STREQUAL "GNU++98")

                     set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "gnu++98")

-                    set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libstdc++")

-                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98 -stdlib=libstdc++")

+                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")

                 ELSE()

                     set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")

-                    set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")

-                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")

+                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

                 ENDIF()

             ENDIF()