Merge branch 'master' of github.com:cginternals/globjects

Author: cgcostume

cmake/CompileOptions.cmake

@@ -114,6 +114,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH
 
         $<$<CXX_COMPILER_ID:GNU>:
             -Wmaybe-uninitialized
+        
+            -Wno-unknown-pragmas
 
             $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.8>:
                 -Wpedantic

source/examples/commandlineoutput/CMakeLists.txt

@@ -65,7 +65,6 @@ target_include_directories(${target}
     PRIVATE
     ${DEFAULT_INCLUDE_DIRECTORIES}
     ${PROJECT_BINARY_DIR}/source/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/..
     SYSTEM
     ${GLFW_INCLUDE_DIR}
 )

source/examples/computeshader/CMakeLists.txt

@@ -68,7 +68,6 @@ target_include_directories(${target}
     PRIVATE
     ${DEFAULT_INCLUDE_DIRECTORIES}
     ${PROJECT_BINARY_DIR}/source/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/..
     SYSTEM
     ${GLFW_INCLUDE_DIR}
 )

source/examples/programpipelines/CMakeLists.txt

@@ -65,7 +65,6 @@ target_include_directories(${target}
     PRIVATE
     ${DEFAULT_INCLUDE_DIRECTORIES}
     ${PROJECT_BINARY_DIR}/source/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/..
     SYSTEM
     ${GLFW_INCLUDE_DIR}
 )

source/examples/qtexample/CMakeLists.txt

@@ -80,7 +80,6 @@ target_include_directories(${target}
     PRIVATE
     ${DEFAULT_INCLUDE_DIRECTORIES}
     ${PROJECT_BINARY_DIR}/source/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR} # for UIC generated headers
 )

source/examples/qtexample/WindowQt.cpp

@@ -1,12 +1,5 @@
 #include "WindowQt.h"
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#pragma GCC diagnostic ignored "-Wconversion"
-#pragma GCC diagnostic ignored "-Wswitch"
-#endif
-
 #pragma warning(push)  
 #pragma warning(disable: 4127 4800 4244)
 #include <QApplication>
@@ -16,10 +9,6 @@
 #include <QOpenGLContext>
 #pragma warning(pop)  
 
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
 
 QSurfaceFormat defaultFormat()
 {

source/examples/qtexample/WindowQt.h

@@ -1,22 +1,12 @@
 #pragma once
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#pragma GCC diagnostic ignored "-Wconversion"
-#pragma GCC diagnostic ignored "-Wswitch"
-#endif
 
 #pragma warning(push)
 #pragma warning(disable: 4127)
 #include <QWindow>
 #include <QScopedPointer>
 #pragma warning(pop)
 
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
 
 class QSurfaceFormat;
 class QOpenGLContext;

source/examples/qtexample/main.cpp

@@ -1,11 +1,4 @@
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#pragma GCC diagnostic ignored "-Wconversion"
-#pragma GCC diagnostic ignored "-Wswitch"
-#endif
-
 #include <iostream>
 #include <algorithm>
 
@@ -17,10 +10,6 @@
 #include <QSurfaceFormat>
 #pragma warning(pop)
 
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/transform.hpp>