From f0d7722c383369111fcc2b97595094a509e456a8 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Fri, 2 Sep 2022 03:38:15 +0100
Subject: [PATCH] disable glad warnings for code we don't control
---
fggl/gfx/ogl/CMakeLists.txt | 1 -
vendor/glad/CMakeLists.txt | 11 +++++++++--
{fggl/gfx/ogl => vendor/glad/src}/glad.c | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
rename {fggl/gfx/ogl => vendor/glad/src}/glad.c (99%)
diff --git a/fggl/gfx/ogl/CMakeLists.txt b/fggl/gfx/ogl/CMakeLists.txt
index 02180ae..50c0a68 100644
--- a/fggl/gfx/ogl/CMakeLists.txt
+++ b/fggl/gfx/ogl/CMakeLists.txt
@@ -2,7 +2,6 @@
# Sources
target_sources(fggl
PRIVATE
- glad.c
backend.cpp
shader.cpp
renderer.cpp
diff --git a/vendor/glad/CMakeLists.txt b/vendor/glad/CMakeLists.txt
index d663884..198df27 100644
--- a/vendor/glad/CMakeLists.txt
+++ b/vendor/glad/CMakeLists.txt
@@ -1,11 +1,18 @@
-add_library(fggl-glad INTERFACE)
+add_library(fggl-glad)
target_include_directories( fggl-glad
- INTERFACE
+ PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/public>
$<INSTALL_INTERFACE:include/fggl>
)
+target_compile_options( fggl-glad PRIVATE -Wall -Wno-pedantic -Wodr -fno-strict-aliasing -fno-strict-overflow )
+target_sources( fggl-glad
+ PRIVATE
+ src/glad.c
+)
+
+
# FIXME should be a cleaner way to do this...
install(
FILES
diff --git a/fggl/gfx/ogl/glad.c b/vendor/glad/src/glad.c
similarity index 99%
rename from fggl/gfx/ogl/glad.c
rename to vendor/glad/src/glad.c
index 5c315dc..db08480 100644
--- a/fggl/gfx/ogl/glad.c
+++ b/vendor/glad/src/glad.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <glad/glad.h>
+#include "glad/glad.h"
void _pre_call_callback_default_gl(const char *name, void *funcptr, int len_args, ...) {
(void) name;
--
GitLab