Renamed GodotCompilerWarnings.cmake to common_compiler_flags.cmake to…

… match scons Included files explicitly by path, as we dont need to append to the CMAKE_MODULES_PATH which effects the whole build tree. This prevents consumers of the library from clobbering the names of the cmake include files and breaking the build.
godotengine · Sep 18, 2024 · b197d23 · b197d23
1 parent ca062d3
commit b197d23
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,9 +11,7 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
     endif ()
 endif ()
 
-# Add path to modules
-list( APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/" )
-include( godotcpp )
+include( ${PROJECT_SOURCE_DIR}/cmake/godotcpp.cmake )
 
 # I know this doesn't look like a typical CMakeLists.txt, but as we are
 # attempting mostly feature parity with SCons, and easy maintenance, the closer

diff --git a/cmake/GodotCompilerWarnings.cmake → cmake/common_compiler_flags.cmake b/cmake/GodotCompilerWarnings.cmake → cmake/common_compiler_flags.cmake
diff --git a/cmake/godotcpp.cmake b/cmake/godotcpp.cmake
@@ -167,7 +167,7 @@ function( godotcpp_generate )
     )
     add_library(godot::cpp ALIAS ${PROJECT_NAME})
 
-    include(GodotCompilerWarnings)
+    include(${PROJECT_SOURCE_DIR}/cmake/common_compiler_flags.cmake)
 
     target_compile_features(${PROJECT_NAME}
             PRIVATE