Apply suggestions

Author: AR-DEV-1

.gitmodules

@@ -1,3 +1,9 @@
-[submodule "engine/native/thirdparty/bgfx.cmake"]
-	path = engine/native/thirdparty/bgfx.cmake
-	url = https://github.com/bkaradzic/bgfx.cmake
+[submodule "engine/native/thirdparty/bx"]
+	path = engine/native/thirdparty/bx
+	url = https://github.com/bkaradzic/bx
+[submodule "engine/native/thirdparty/bimg"]
+	path = engine/native/thirdparty/bimg
+	url = https://github.com/bkaradzic/bimg
+[submodule "engine/native/thirdparty/bgfx"]
+	path = engine/native/thirdparty/bgfx
+	url = https://github.com/bkaradzic/bgfx

CMakeLists.txt

@@ -24,9 +24,12 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
 endif()
 
 project(DraconicEngine LANGUAGES C CXX)
-set(CMAKE_CXX_SCAN_FOR_MODULES ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Only have safe global rules here
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_MODULE_STD ON)
+
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 include(CTest)

cmake/Modules.cmake

@@ -93,6 +93,13 @@ function(add_modules_library)
 
 endfunction()
 
+function(enable_modules target)
+    set_target_properties(
+        ${target} PROPERTIES
+        CXX_SCAN_FOR_MODULES ON
+    )
+endfunction()
+
 function(target_link_modules)
     cmake_parse_arguments(
         MOD_LINK # prefix for all variables

engine/native/CMakeLists.txt

@@ -1,8 +1,7 @@
 include(Compiler)
+include(Modules)
 
 add_subdirectory(thirdparty)
 
-include(Modules)
-
 add_modules_library(core SHARED)
 target_link_libraries(core PUBLIC definitions math)

engine/native/thirdparty/CMakeLists.txt

@@ -3,15 +3,11 @@ set(BGFX_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
 set(BGFX_INSTALL OFF CACHE BOOL "" FORCE)
 set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
 
-add_subdirectory(bgfx.cmake)
-
-# Prevent module scanning for bgfx & it's deps
-set_target_properties(bgfx PROPERTIES CXX_SCAN_FOR_MODULES OFF)
-
-if(TARGET bx)
-    set_target_properties(bx PROPERTIES CXX_SCAN_FOR_MODULES OFF)
-endif()
-
-if(TARGET bimg)
-    set_target_properties(bimg PROPERTIES CXX_SCAN_FOR_MODULES OFF)
-endif()
+set(BX_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bx CACHE STRING "" FORCE) 
+set(BIMG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bimg CACHE STRING "" FORCE) 
+set(BGFX_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bgfx CACHE STRING "" FORCE) 
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bx bx-build) 
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bimg bimg-build) 
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bgfx bgfx-build)
+
+target_link_libraries(bgfx PUBLIC bx bimg)

engine/native/thirdparty/bgfx

@@ -0,0 +1,31 @@
+@PACKAGE_INIT@
+
+if(@BGFX_CMAKE_USER_SCRIPT_PRESENT@)
+	include("${CMAKE_CURRENT_LIST_DIR}/@BGFX_CMAKE_USER_SCRIPT_INSTALL_NAME@")
+endif()
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+get_target_property(BGFX_INCLUDE_PATH bgfx::bgfx INTERFACE_INCLUDE_DIRECTORIES)
+list(GET BGFX_INCLUDE_PATH 0 BGFX_INCLUDE_PATH_1) # bgfx::bgfx exports include directory twice?
+set(BGFX_SHADER_INCLUDE_PATH ${BGFX_INCLUDE_PATH_1}/bgfx)
+
+# If cross compiling, we need a host-compatible version of shaderc to compile shaders
+macro(_bgfx_crosscompile_use_host_tool TOOL_NAME)
+	if(NOT TARGET bgfx::${TOOL_NAME})
+		find_program(
+			${TOOL_NAME}_EXECUTABLE
+			NAMES bgfx-${TOOL_NAME} ${TOOL_NAME}
+			PATHS @BGFX_ADDITIONAL_TOOL_PATHS@ /usr/bin
+		)
+		add_executable(bgfx::${TOOL_NAME} IMPORTED)
+		set_target_properties(bgfx::${TOOL_NAME} PROPERTIES IMPORTED_LOCATION "${${TOOL_NAME}_EXECUTABLE}")
+	endif()
+endmacro()
+
+_bgfx_crosscompile_use_host_tool(bin2c)
+_bgfx_crosscompile_use_host_tool(texturec)
+_bgfx_crosscompile_use_host_tool(shaderc)
+_bgfx_crosscompile_use_host_tool(texturev)
+_bgfx_crosscompile_use_host_tool(geometryv)
+
+include("${CMAKE_CURRENT_LIST_DIR}/bgfxToolUtils.cmake")
+check_required_components("@PROJECT_NAME@")