From 6958ae6e0a0459060456be070b0e339f521f70e3 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Thu, 18 Jan 2024 04:31:29 -0800 Subject: [PATCH] I HAVE 20 DOLLARS AND I NEED A WII GAME FOR MY KID --- .gitmodules | 1 + CMakeLists.txt | 4 +++- thirdparty/CMakeLists.txt | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4ba6a43b..80d23fa4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,7 @@ [submodule "thirdparty/recastnavigation"] path = thirdparty/recastnavigation url = https://github.com/recastnavigation/recastnavigation + ignore = dirty [submodule "thirdparty/libbcrypt"] path = thirdparty/libbcrypt url = https://github.com/trusch/libbcrypt.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 91f1a475..616b1613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "" FORCE) # Disabled no-register # Disabled unknown pragmas because Linux doesn't understand Windows pragmas. if(UNIX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wuninitialized -fPIC -Werror") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wuninitialized -fPIC") add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0 _GLIBCXX_USE_CXX17_ABI=0) if(NOT APPLE) @@ -273,6 +273,8 @@ link_directories(${PROJECT_BINARY_DIR}) # Load all of our third party directories add_subdirectory(thirdparty) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + # Glob together all headers that need to be precompiled file( GLOB HEADERS_DDATABASE diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index c8293290..11d278c0 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -1,8 +1,6 @@ # Source Code for recast add_subdirectory(recastnavigation) -target_compile_definitions(recastnavigation PRIVATE "-Wno-maybe-uninitialized") - # Turn off tinyxml2 testing set(tinyxml2_BUILD_TESTING OFF) # Source Code for tinyxml2