build(deps): bump the submodules group with 3 updates

Bumps the submodules group with 3 updates: [bgfx](https://github.com/bkaradzic/bgfx), [bx](https://github.com/bkaradzic/bx) and [bimg](https://github.com/bkaradzic/bimg).


Updates `bgfx` from `57d8a08` to `00fa5ad`
- [Commits](57d8a0838b...00fa5ad179)

Updates `bx` from `34ba9c7` to `d171a0f`
- [Commits](34ba9c7a5c...d171a0f264)

Updates `bimg` from `e9fa0ce` to `98a40e8`
- [Commits](e9fa0ceff2...98a40e8533)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-type: direct:production
  dependency-group: submodules
- dependency-name: bx
  dependency-type: direct:production
  dependency-group: submodules
- dependency-name: bimg
  dependency-type: direct:production
  dependency-group: submodules
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @bwrsandman

.github/dependabot.yml

@@ -4,3 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    groups:
+      # Name of the group
+      submodules:
+        patterns:
+          - "*"

.github/workflows/ci.yml

@@ -1,4 +1,3 @@
-# https://github.com/openblack/bgfx.cmake/blob/master/.github/workflows/ci.yml
 name: CI
 
 on:
@@ -7,10 +6,41 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  # Indicates the CMake build directory where project files and binaries are being produced.
+  CMAKE_BUILD_DIR: ${{ github.workspace }}/build/
+
 jobs:
+  minimum-cmake-version:
+    name: Check compatibility with minimum cmake version
+    runs-on: ubuntu-latest
+    env:
+      CMAKE_VERSION: 3.10.2
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Install Linux dependencies
+        run: |
+          sudo apt-get update
+          sudo apt install -y libgl1-mesa-dev
+      - uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: ${{ env.CMAKE_VERSION }}
+      - name: Check cmake version
+        run: |
+          cmake --version | grep ${{ env.CMAKE_VERSION }}
+      - name: Test config
+        # old way of configuring a build directory
+        run: |
+          mkdir -p "${{ env.CMAKE_BUILD_DIR }}"
+          cd "${{ env.CMAKE_BUILD_DIR }}"
+          cmake ${{ github.workspace }} -GNinja -DCMAKE_BUILD_TYPE=Release
+
   native:
     name: ${{ matrix.os }} ${{ matrix.cc }}
     runs-on: ${{ matrix.os }}
+    needs: minimum-cmake-version
     strategy:
       fail-fast: false
       matrix:
@@ -23,16 +53,11 @@ jobs:
             cc: clang
             cxx: clang++
           - os: macos-latest
-
     env:
-      # Indicates the CMake build directory where project files and binaries are being produced.
-      CMAKE_BUILD_DIR: ${{ github.workspace }}/build/
-
       CC: ${{ matrix.cc }}
       CXX: ${{ matrix.cxx }}
-
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Install Linux dependencies
@@ -65,15 +90,11 @@ jobs:
   cross-android:
     name: cross-android
     runs-on: ubuntu-latest
+    needs: minimum-cmake-version
     strategy:
       fail-fast: false
-
-    env:
-      # Indicates the CMake build directory where project files and binaries are being produced.
-      CMAKE_BUILD_DIR: ${{ github.workspace }}/build/
-
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Install Linux dependencies

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       sha: ${{ steps.version.outputs.sha }}
       tag: ${{ steps.version.outputs.tag }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
           fetch-depth: 0
@@ -29,9 +29,9 @@ jobs:
           BGFX_CMAKE_REVISION=$(git rev-list HEAD --count)
           SHA=$(cd bgfx && git rev-parse HEAD)
           TAG="v1.${API_VERSION}.${BGFX_REVISION}-${BGFX_CMAKE_REVISION}"
-          echo "::set-output name=revision::${BGFX_REVISION}"
-          echo "::set-output name=sha::${SHA}"
-          echo "::set-output name=tag::${TAG}"
+          echo "revision=${BGFX_REVISION}" >> $GITHUB_OUTPUT
+          echo "sha=${SHA}" >> $GITHUB_OUTPUT
+          echo "tag=${TAG}" >> $GITHUB_OUTPUT
 
   build:
     name: ${{ matrix.os }}
@@ -51,7 +51,7 @@ jobs:
       CMAKE_INSTALL_DIR: ${{ github.workspace }}/install/
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Install Linux dependencies
@@ -75,12 +75,12 @@ jobs:
       # Run CMake to generate project files
       - name: Generate project files
         run: |
-          cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ env.CMAKE_INSTALL_DIR }}" -DCMAKE_DEBUG_POSTFIX=d -DBGFX_BUILD_EXAMPLES=OFF -DBGFX_BUILD_TOOLS=ON -DBGFX_INSTALL=ON -DBGFX_AMALGAMATED=ON -DCMAKE_BUILD_TYPE=Release
+          cmake -B "${{ env.CMAKE_BUILD_DIR }}" "-DCMAKE_INSTALL_PREFIX=${{ env.CMAKE_INSTALL_DIR }}" -DCMAKE_DEBUG_POSTFIX=d -DBGFX_BUILD_EXAMPLES=OFF -DBGFX_BUILD_TOOLS=ON -DBGFX_INSTALL=ON -DBGFX_AMALGAMATED=ON -DCMAKE_BUILD_TYPE=Release
       # Build the install targets
       - name: Build
         run: |
           cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target install --config Release
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}
           path: ${{ github.workspace }}/install/
@@ -90,11 +90,89 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ version, build ]
     if: github.repository == 'bkaradzic/bgfx.cmake' && github.event_name == 'push'
+    permissions:
+      contents: write
     steps:
-      - name: Create Release
-        uses: actions/create-release@v1
+      - uses: actions/checkout@v3
         with:
-          tag_name: ${{ needs.version.outputs.tag }}
-          release_name: ${{ needs.version.outputs.tag }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          submodules: recursive
+          fetch-depth: 0
+          path: src/bgfx.cmake
+      - run: |
+          find src/bgfx.cmake -name ".git*" -exec rm -rf {} +
+          find src/bgfx.cmake -name ".editorconfig" -delete
+          rm src/bgfx.cmake/.cmake-format.py
+      - uses: actions/download-artifact@v3
+        with:
+          name: windows-latest
+          path: ${{ github.workspace }}/install/windows/bgfx.cmake
+      - uses: actions/download-artifact@v3
+        with:
+          name: ubuntu-latest
+          path: ${{ github.workspace }}/install/linux/bgfx.cmake
+      - uses: actions/download-artifact@v3
+        with:
+          name: macos-latest
+          path: ${{ github.workspace }}/install/macos/bgfx.cmake
+      - name: Create Source Zip
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'zip'
+          filename: 'bgfx.cmake.${{ needs.version.outputs.tag }}.zip'
+          directory: 'src'
+          path: 'bgfx.cmake'
+      - name: Create Source Tar
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'tar'
+          filename: 'bgfx.cmake.${{ needs.version.outputs.tag }}.tar.gz'
+          directory: 'src'
+          path: 'bgfx.cmake'
+      - name: Create Windows Zip
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'zip'
+          filename: 'bgfx.cmake.binary.windows.${{ needs.version.outputs.tag }}.zip'
+          directory: 'install/windows'
+          path: 'bgfx.cmake'
+      - name: Create Windows Tar
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'tar'
+          filename: 'bgfx.cmake.binary.windows.${{ needs.version.outputs.tag }}.tar.gz'
+          directory: 'install/windows'
+          path: 'bgfx.cmake'
+      - name: Create Linux Zip
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'zip'
+          filename: 'bgfx.cmake.binary.linux.${{ needs.version.outputs.tag }}.zip'
+          directory: 'install/linux'
+          path: 'bgfx.cmake'
+      - name: Create Linux Tar
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'tar'
+          filename: 'bgfx.cmake.binary.linux.${{ needs.version.outputs.tag }}.tar.gz'
+          directory: 'install/linux'
+          path: 'bgfx.cmake'
+      - name: Create MacOS Zip
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'zip'
+          filename: 'bgfx.cmake.binary.macos.${{ needs.version.outputs.tag }}.zip'
+          directory: 'install/macos'
+          path: 'bgfx.cmake'
+      - name: Create MacOS Tar
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'tar'
+          filename: 'bgfx.cmake.binary.macos.${{ needs.version.outputs.tag }}.tar.gz'
+          directory: 'install/macos'
+          path: 'bgfx.cmake'
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ needs.version.outputs.tag }}
+          artifacts: "src/bgfx.cmake.${{ needs.version.outputs.tag }}.zip,src/bgfx.cmake.${{ needs.version.outputs.tag }}.tar.gz,install/*/*.${{ needs.version.outputs.tag }}.zip,install/*/*.${{ needs.version.outputs.tag }}.tar.gz"
+          generateReleaseNotes: true

CMakeLists.txt

@@ -8,12 +8,12 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.10.2) # version supported by android studio
 project(bgfx)
 cmake_policy(SET CMP0054 NEW)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -38,6 +38,10 @@ cmake_dependent_option(BGFX_BUILD_TOOLS_GEOMETRY "Build bgfx geometry tools." ON
 cmake_dependent_option(BGFX_BUILD_TOOLS_TEXTURE "Build bgfx texture tools." ON BGFX_BUILD_TOOLS OFF)
 set(BGFX_TOOLS_PREFIX "" CACHE STRING "Prefix name to add to name of tools (to avoid clashes)")
 option(BGFX_BUILD_EXAMPLES "Build bgfx examples." ON)
+cmake_dependent_option(
+	BGFX_BUILD_EXAMPLE_COMMON "Build bgfx example-common project." OFF "NOT BGFX_BUILD_EXAMPLES;NOT BGFX_BUILD_TOOLS"
+	ON
+)
 option(BGFX_BUILD_TESTS "Build bgfx tests." OFF)
 option(BGFX_INSTALL "Create installation target." ON)
 cmake_dependent_option(
@@ -94,6 +98,10 @@ elseif(NOT IS_ABSOLUTE "${BGFX_DIR}")
 	get_filename_component(BGFX_DIR "${BGFX_DIR}" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 endif()
 
+file(TO_CMAKE_PATH "${BX_DIR}" BX_DIR)
+file(TO_CMAKE_PATH "${BIMG_DIR}" BIMG_DIR)
+file(TO_CMAKE_PATH "${BGFX_DIR}" BGFX_DIR)
+
 # sets project version from api ver / git rev
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake)
 if(BGFX_BUILD_TOOLS AND BGFX_CUSTOM_TARGETS)
@@ -101,10 +109,6 @@ if(BGFX_BUILD_TOOLS AND BGFX_CUSTOM_TARGETS)
 	set_target_properties(tools PROPERTIES FOLDER "bgfx/tools")
 endif()
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bx)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bimg)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bgfx)
-
 if(BGFX_INSTALL)
 	include(GNUInstallDirs)
 
@@ -120,7 +124,13 @@ if(BGFX_INSTALL)
 	set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
 	set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
 	set(namespace "${PROJECT_NAME}::")
+endif()
 
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bx)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bimg)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bgfx)
+
+if(BGFX_INSTALL)
 	# Include module with fuction 'write_basic_package_version_file'
 	include(CMakePackageConfigHelpers)
 
@@ -154,77 +164,11 @@ if(BGFX_INSTALL)
 
 	install(FILES ${BGFX_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/licences/${PROJECT_NAME})
 
-	install(
-		TARGETS bgfx
-		EXPORT "${TARGETS_EXPORT_NAME}"
-		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-		INCLUDES
-		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-	)
-	if(NOT BGFX_LIBRARY_TYPE MATCHES "SHARED")
-		install(
-			TARGETS bimg bx
-			EXPORT "${TARGETS_EXPORT_NAME}"
-			LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-			ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-			RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-			INCLUDES
-			DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-		)
-	endif()
-	if(BGFX_CONFIG_RENDERER_WEBGPU)
-		install(
-			TARGETS webgpu
-			EXPORT "${TARGETS_EXPORT_NAME}"
-			LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-			ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-			RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-			INCLUDES
-			DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-		)
-	endif()
-
-	# install headers (this should be done as a target probably... ^)
-	install(DIRECTORY ${BX_DIR}/include/bx ${BX_DIR}/include/compat ${BX_DIR}/include/tinystl
-			DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-	)
-	install(DIRECTORY ${BIMG_DIR}/include/bimg DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-	install(DIRECTORY ${BGFX_DIR}/include/bgfx DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-
-	# header required for shader compilation
-	install(FILES ${BGFX_DIR}/src/bgfx_shader.sh ${BGFX_DIR}/src/bgfx_compute.sh
-			DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/bgfx"
-	)
-
 	# install tools
 	if(BGFX_CMAKE_USER_SCRIPT)
 		install(FILES ${BGFX_CMAKE_USER_SCRIPT} DESTINATION "${config_install_dir}")
 	endif()
 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/bgfxToolUtils.cmake DESTINATION "${config_install_dir}")
-	if(BGFX_BUILD_TOOLS_BIN2C)
-		install(TARGETS bin2c EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
-	endif()
-	if(BGFX_BUILD_TOOLS_SHADER)
-		install(TARGETS shaderc EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
-	endif()
-	if(BGFX_BUILD_TOOLS_GEOMETRY)
-		install(TARGETS geometryc EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
-		install(TARGETS geometryv EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
-	endif()
-	if(BGFX_BUILD_TOOLS_TEXTURE)
-		install(TARGETS texturec EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
-		install(TARGETS texturev EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
-	endif()
-
-	# install examples
-	if(BGFX_BUILD_EXAMPLES AND BGFX_INSTALL_EXAMPLES)
-		install(DIRECTORY ${BGFX_DIR}/examples/runtime/ DESTINATION examples)
-		foreach(EXAMPLE ${BGFX_EXAMPLES})
-			install(TARGETS example-${EXAMPLE} DESTINATION examples)
-		endforeach()
-	endif()
 
 	# Config
 	#   * <prefix>/lib/cmake/bgfx/bgfxConfig.cmake

README.md

@@ -48,8 +48,9 @@ Adding these `INPUT_FILE` as source files to a target will run `bin2c` at build
 #### Examples: Generating an image as a header
 ```cmake
 bgfx_compile_binary_to_header(
-  INPUT_FILE image.png
+  INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/image.png
   OUTPUT_FILE ${CMAKE_BINARY_DIR}/include/generated/images/image.png.h
+  ARRAY_NAME image_bytes
 )
 add_library(myLib image.png)
 target_include_directories(myLib ${CMAKE_BINARY_DIR}/include/generated/images)
@@ -58,6 +59,7 @@ target_include_directories(myLib ${CMAKE_BINARY_DIR}/include/generated/images)
 ```cpp
 // main.cpp
 #include <image.png.h>
+// You now have access to a static const uint8_t or char array named image_bytes
 ```
 
 ### `bgfx_compile_texture`

cmake/Config.cmake.in

@@ -9,28 +9,23 @@ list(GET BGFX_INCLUDE_PATH 0 BGFX_INCLUDE_PATH_1) # bgfx::bgfx exports include d
 set(BGFX_SHADER_INCLUDE_PATH ${BGFX_INCLUDE_PATH_1}/bgfx)
 
 # If cross compiling, we need a host-compatible version of shaderc to compile shaders
-if(@CMAKE_CROSSCOMPILING@)
-	macro(_bgfx_crosscompile_use_host_tool TOOL_NAME)
-		if(NOT TARGET bgfx::${TOOL_NAME})
-			find_program(
-				${TOOL_NAME}_EXECUTABLE REQUIRED
-				NAMES bgfx-${TOOL_NAME} ${TOOL_NAME}
-				PATHS /usr/bin #
-					  ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/bgfx_x64-linux/tools/bgfx
-					  ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/bgfx_x64-windows/tools/bgfx
-					  ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/bgfx_x64-osx/tools/bgfx
-			)
-			add_executable(bgfx::${TOOL_NAME} IMPORTED)
-			set_target_properties(bgfx::${TOOL_NAME} PROPERTIES IMPORTED_LOCATION "${${TOOL_NAME}_EXECUTABLE}")
-		endif()
-	endmacro()
+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)
-endif()
+_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@")

cmake/bgfx/3rdparty/fcpp.cmake

@@ -16,7 +16,20 @@ endif()
 
 set(FCPP_DIR ${BGFX_DIR}/3rdparty/fcpp)
 
-add_library(fcpp STATIC)
+file(
+	GLOB
+	FCPP_SOURCES
+	${FCPP_DIR}/*.h
+	${FCPP_DIR}/cpp1.c
+	${FCPP_DIR}/cpp2.c
+	${FCPP_DIR}/cpp3.c
+	${FCPP_DIR}/cpp4.c
+	${FCPP_DIR}/cpp5.c
+	${FCPP_DIR}/cpp6.c
+	${FCPP_DIR}/cpp6.c
+)
+
+add_library(fcpp STATIC ${FCPP_SOURCES})
 
 target_compile_definitions(
 	fcpp
@@ -32,21 +45,6 @@ set_target_properties(fcpp PROPERTIES FOLDER "bgfx")
 
 target_include_directories(fcpp PUBLIC ${FCPP_DIR})
 
-file(
-	GLOB
-	FCPP_SOURCES
-	${FCPP_DIR}/*.h
-	${FCPP_DIR}/cpp1.c
-	${FCPP_DIR}/cpp2.c
-	${FCPP_DIR}/cpp3.c
-	${FCPP_DIR}/cpp4.c
-	${FCPP_DIR}/cpp5.c
-	${FCPP_DIR}/cpp6.c
-	${FCPP_DIR}/cpp6.c
-)
-
-target_sources(fcpp PRIVATE ${FCPP_SOURCES})
-
 if(MSVC)
 	target_compile_options(
 		fcpp

cmake/bgfx/3rdparty/glsl-optimizer.cmake

@@ -16,20 +16,6 @@ endif()
 
 set(GLSL_OPTIMIZER ${BGFX_DIR}/3rdparty/glsl-optimizer)
 
-add_library(glsl-optimizer STATIC)
-
-# Put in a "bgfx" folder in Visual Studio
-set_target_properties(glsl-optimizer PROPERTIES FOLDER "bgfx")
-
-target_include_directories(
-	glsl-optimizer
-	PUBLIC ${GLSL_OPTIMIZER}/include #
-		   ${GLSL_OPTIMIZER}/src/glsl #
-	PRIVATE ${GLSL_OPTIMIZER}/src #
-			${GLSL_OPTIMIZER}/src/mesa #
-			${GLSL_OPTIMIZER}/src/mapi #
-)
-
 file(
 	GLOB
 	GLSL_OPTIMIZER_SOURCES
@@ -193,7 +179,19 @@ file(
 	${GLSL_OPTIMIZER}/src/util/ralloc.h
 )
 
-target_sources(glsl-optimizer PRIVATE ${GLSL_OPTIMIZER_SOURCES})
+add_library(glsl-optimizer STATIC ${GLSL_OPTIMIZER_SOURCES})
+
+# Put in a "bgfx" folder in Visual Studio
+set_target_properties(glsl-optimizer PROPERTIES FOLDER "bgfx")
+
+target_include_directories(
+	glsl-optimizer
+	PUBLIC ${GLSL_OPTIMIZER}/include #
+		   ${GLSL_OPTIMIZER}/src/glsl #
+	PRIVATE ${GLSL_OPTIMIZER}/src #
+			${GLSL_OPTIMIZER}/src/mesa #
+			${GLSL_OPTIMIZER}/src/mapi #
+)
 
 if(MSVC)
 	target_compile_definitions(

cmake/bgfx/3rdparty/glslang.cmake

@@ -17,27 +17,6 @@ endif()
 set(GLSLANG ${BGFX_DIR}/3rdparty/glslang)
 set(SPIRV_TOOLS ${BGFX_DIR}/3rdparty/spirv-tools)
 
-add_library(glslang STATIC)
-
-target_compile_definitions(
-	glslang
-	PRIVATE #
-			ENABLE_OPT=1 # spriv-tools
-			ENABLE_HLSL=1 #
-)
-
-# Put in a "bgfx" folder in Visual Studio
-set_target_properties(glslang PROPERTIES FOLDER "bgfx")
-
-target_include_directories(
-	glslang
-	PUBLIC ${GLSLANG} #
-		   ${GLSLANG}/glslang/Public #
-	PRIVATE ${GLSLANG}/.. #
-			${SPIRV_TOOLS}/include #
-			${SPIRV_TOOLS}/source #
-)
-
 file(
 	GLOB_RECURSE
 	GLSLANG_SOURCES
@@ -62,4 +41,23 @@ else()
 	list(FILTER GLSLANG_SOURCES EXCLUDE REGEX "glslang/OSDependent/Windows/.*.h")
 endif()
 
-target_sources(glslang PRIVATE ${GLSLANG_SOURCES})
+add_library(glslang STATIC ${GLSLANG_SOURCES})
+
+target_compile_definitions(
+	glslang
+	PRIVATE #
+			ENABLE_OPT=1 # spriv-tools
+			ENABLE_HLSL=1 #
+)
+
+# Put in a "bgfx" folder in Visual Studio
+set_target_properties(glslang PROPERTIES FOLDER "bgfx")
+
+target_include_directories(
+	glslang
+	PUBLIC ${GLSLANG} #
+		   ${GLSLANG}/glslang/Public #
+	PRIVATE ${GLSLANG}/.. #
+			${SPIRV_TOOLS}/include #
+			${SPIRV_TOOLS}/source #
+)

cmake/bgfx/3rdparty/spirv-cross.cmake

@@ -16,21 +16,6 @@ endif()
 
 set(SPIRV_CROSS ${BGFX_DIR}/3rdparty/spirv-cross)
 
-add_library(spirv-cross STATIC)
-
-target_compile_definitions(spirv-cross PRIVATE SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
-
-# Put in a "bgfx" folder in Visual Studio
-set_target_properties(spirv-cross PROPERTIES FOLDER "bgfx")
-
-target_include_directories(
-	spirv-cross #
-	PUBLIC #
-		   ${SPIRV_CROSS} #
-	PRIVATE #
-			${SPIRV_CROSS}/include #
-)
-
 file(
 	GLOB
 	SPIRV_CROSS_SOURCES
@@ -59,4 +44,17 @@ file(
 	${SPIRV_CROSS}/spirv_reflect.hpp
 )
 
-target_sources(spirv-cross PRIVATE ${SPIRV_CROSS_SOURCES})
+add_library(spirv-cross STATIC ${SPIRV_CROSS_SOURCES})
+
+target_compile_definitions(spirv-cross PRIVATE SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
+
+# Put in a "bgfx" folder in Visual Studio
+set_target_properties(spirv-cross PROPERTIES FOLDER "bgfx")
+
+target_include_directories(
+	spirv-cross #
+	PUBLIC #
+		   ${SPIRV_CROSS} #
+	PRIVATE #
+			${SPIRV_CROSS}/include #
+)

cmake/bgfx/3rdparty/spirv-opt.cmake

@@ -17,20 +17,6 @@ endif()
 set(SPIRV_HEADERS ${BGFX_DIR}/3rdparty/spirv-headers)
 set(SPIRV_TOOLS ${BGFX_DIR}/3rdparty/spirv-tools)
 
-add_library(spirv-opt STATIC)
-
-# Put in a "bgfx" folder in Visual Studio
-set_target_properties(spirv-opt PROPERTIES FOLDER "bgfx")
-
-target_include_directories(
-	spirv-opt
-	PUBLIC ${SPIRV_TOOLS}/include #
-	PRIVATE ${SPIRV_TOOLS} #
-			${SPIRV_TOOLS}/include/generated #
-			${SPIRV_TOOLS}/source #
-			${SPIRV_HEADERS}/include #
-)
-
 file(
 	GLOB
 	SPIRV_OPT_SOURCES
@@ -138,10 +124,23 @@ file(
 	${SPIRV_TOOLS}/source/val/validate_primitives.cpp
 	${SPIRV_TOOLS}/source/val/validate_ray_query.cpp
 	${SPIRV_TOOLS}/source/val/validate_ray_tracing.cpp
+	${SPIRV_TOOLS}/source/val/validate_ray_tracing_reorder.cpp
 	${SPIRV_TOOLS}/source/val/validate_scopes.cpp
 	${SPIRV_TOOLS}/source/val/validate_small_type_uses.cpp
 	${SPIRV_TOOLS}/source/val/validate_type.cpp
 	${SPIRV_TOOLS}/source/val/validation_state.cpp
 )
 
-target_sources(spirv-opt PRIVATE ${SPIRV_OPT_SOURCES})
+add_library(spirv-opt STATIC ${SPIRV_OPT_SOURCES})
+
+# Put in a "bgfx" folder in Visual Studio
+set_target_properties(spirv-opt PROPERTIES FOLDER "bgfx")
+
+target_include_directories(
+	spirv-opt
+	PUBLIC ${SPIRV_TOOLS}/include #
+	PRIVATE ${SPIRV_TOOLS} #
+			${SPIRV_TOOLS}/include/generated #
+			${SPIRV_TOOLS}/source #
+			${SPIRV_HEADERS}/include #
+)

cmake/bgfx/3rdparty/webgpu.cmake

@@ -24,4 +24,17 @@ target_include_directories(
 	INTERFACE $<BUILD_INTERFACE:${BGFX_DIR}/3rdparty/webgpu/include>
 )
 
-set_target_properties(webgpu PROPERTIES FOLDER "bgfx/3rdparty" PREFIX "${CMAKE_STATIC_LIBRARY_PREFIX}bgfx-")
+# These properties are not allowed on interface
+# set_target_properties(webgpu PROPERTIES FOLDER "bgfx/3rdparty" PREFIX "${CMAKE_STATIC_LIBRARY_PREFIX}bgfx-")
+
+if(BGFX_INSTALL AND BGFX_CONFIG_RENDERER_WEBGPU)
+	install(
+		TARGETS webgpu
+		EXPORT "${TARGETS_EXPORT_NAME}"
+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+		INCLUDES
+		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+	)
+endif()

cmake/bgfx/CMakeLists.txt

@@ -12,9 +12,6 @@ include(bgfx.cmake)
 include(3rdparty/meshoptimizer.cmake)
 include(3rdparty/dear-imgui.cmake)
 
-include(shared.cmake)
-include(examples.cmake)
-
 if(BGFX_BUILD_TOOLS_TEXTURE)
 	include(texturev.cmake)
 endif()
@@ -31,3 +28,6 @@ if(BGFX_BUILD_TOOLS_SHADER)
 	include(3rdparty/webgpu.cmake)
 	include(shaderc.cmake)
 endif()
+
+include(shared.cmake)
+include(examples.cmake)

cmake/bgfx/bgfx.cmake

@@ -206,3 +206,22 @@ if(XCODE)
 		${BGFX_DIR}/src/renderer_vk.cpp PROPERTIES LANGUAGE OBJCXX XCODE_EXPLICIT_FILE_TYPE sourcecode.cpp.objcpp
 	)
 endif()
+
+if(BGFX_INSTALL)
+	install(
+		TARGETS bgfx
+		EXPORT "${TARGETS_EXPORT_NAME}"
+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+		INCLUDES
+		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+	)
+
+	install(DIRECTORY ${BGFX_DIR}/include/bgfx DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+	# header required for shader compilation
+	install(FILES ${BGFX_DIR}/src/bgfx_shader.sh ${BGFX_DIR}/src/bgfx_compute.sh
+			DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/bgfx"
+	)
+endif()

cmake/bgfx/examples.cmake

@@ -33,19 +33,6 @@ function(add_bgfx_shader FILE FOLDER)
 		set(OUTPUTS_PRETTY "")
 
 		if(WIN32)
-			# dx9
-			if(NOT "${TYPE}" STREQUAL "COMPUTE")
-				set(DX9_OUTPUT ${BGFX_DIR}/examples/runtime/shaders/dx9/${FILENAME}.bin)
-				_bgfx_shaderc_parse(
-					DX9 ${COMMON} WINDOWS
-					PROFILE s_3_0
-					O 3
-					OUTPUT ${DX9_OUTPUT}
-				)
-				list(APPEND OUTPUTS "DX9")
-				set(OUTPUTS_PRETTY "${OUTPUTS_PRETTY}DX9, ")
-			endif()
-
 			# dx11
 			set(DX11_OUTPUT ${BGFX_DIR}/examples/runtime/shaders/dx11/${FILENAME}.bin)
 			if(NOT "${TYPE}" STREQUAL "COMPUTE")
@@ -78,7 +65,7 @@ function(add_bgfx_shader FILE FOLDER)
 		# essl
 		if(NOT "${TYPE}" STREQUAL "COMPUTE")
 			set(ESSL_OUTPUT ${BGFX_DIR}/examples/runtime/shaders/essl/${FILENAME}.bin)
-			_bgfx_shaderc_parse(ESSL ${COMMON} ANDROID OUTPUT ${ESSL_OUTPUT})
+			_bgfx_shaderc_parse(ESSL ${COMMON} ANDROID PROFILE 100_es OUTPUT ${ESSL_OUTPUT})
 			list(APPEND OUTPUTS "ESSL")
 			set(OUTPUTS_PRETTY "${OUTPUTS_PRETTY}ESSL, ")
 		endif()
@@ -105,7 +92,7 @@ function(add_bgfx_shader FILE FOLDER)
 
 		foreach(OUT ${OUTPUTS})
 			list(APPEND OUTPUT_FILES ${${OUT}_OUTPUT})
-			list(APPEND COMMANDS COMMAND "$<TARGET_FILE:shaderc>" ${${OUT}})
+			list(APPEND COMMANDS COMMAND "bgfx::shaderc" ${${OUT}})
 			get_filename_component(OUT_DIR ${${OUT}_OUTPUT} DIRECTORY)
 			file(MAKE_DIRECTORY ${OUT_DIR})
 		endforeach()
@@ -211,14 +198,13 @@ function(add_example ARG_NAME)
 
 	else()
 		if(ANDROID)
-			add_library(example-${ARG_NAME} SHARED)
+			add_library(example-${ARG_NAME} SHARED ${SOURCES})
 		else()
-			add_executable(example-${ARG_NAME} WIN32)
+			add_executable(example-${ARG_NAME} WIN32 ${SOURCES})
 		endif()
 		if(NOT BGFX_INSTALL_EXAMPLES)
 			set_property(TARGET example-${ARG_NAME} PROPERTY EXCLUDE_FROM_ALL ON)
 		endif()
-		target_sources(example-${ARG_NAME} PUBLIC ${SOURCES})
 		target_link_libraries(example-${ARG_NAME} PUBLIC example-common)
 		configure_debugging(example-${ARG_NAME} WORKING_DIR ${BGFX_DIR}/examples/runtime)
 		if(MSVC)
@@ -277,17 +263,19 @@ if(BGFX_CUSTOM_TARGETS)
 endif()
 
 # Add common library for examples
-add_example(
-	common
-	COMMON
-	DIRECTORIES
-	${BGFX_DIR}/examples/common/debugdraw
-	${BGFX_DIR}/examples/common/entry
-	${BGFX_DIR}/examples/common/font
-	${BGFX_DIR}/examples/common/imgui
-	${BGFX_DIR}/examples/common/nanovg
-	${BGFX_DIR}/examples/common/ps
-)
+if(BGFX_BUILD_EXAMPLE_COMMON)
+	add_example(
+		common
+		COMMON
+		DIRECTORIES
+		${BGFX_DIR}/examples/common/debugdraw
+		${BGFX_DIR}/examples/common/entry
+		${BGFX_DIR}/examples/common/font
+		${BGFX_DIR}/examples/common/imgui
+		${BGFX_DIR}/examples/common/nanovg
+		${BGFX_DIR}/examples/common/ps
+	)
+endif()
 
 # Only add examples if set, otherwise we still need exmaples common for tools
 if(BGFX_BUILD_EXAMPLES)
@@ -346,4 +334,11 @@ if(BGFX_BUILD_EXAMPLES)
 	foreach(EXAMPLE ${BGFX_EXAMPLES})
 		add_example(${EXAMPLE})
 	endforeach()
+
+	if(BGFX_INSTALL_EXAMPLES)
+		install(DIRECTORY ${BGFX_DIR}/examples/runtime/ DESTINATION examples)
+		foreach(EXAMPLE ${BGFX_EXAMPLES})
+			install(TARGETS example-${EXAMPLE} DESTINATION examples)
+		endforeach()
+	endif()
 endif()

cmake/bgfx/generated/shader.cpp.in

@@ -1,4 +1,3 @@
 #include "@BGFX_DIR@/src/shader.cpp"
-#include "@BGFX_DIR@/src/shader_dx9bc.cpp"
 #include "@BGFX_DIR@/src/shader_dxbc.cpp"
-#include "@BGFX_DIR@/src/shader_spirv.cpp"
+#include "@BGFX_DIR@/src/shader_spirv.cpp"

cmake/bgfx/geometryc.cmake

@@ -8,8 +8,6 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-add_executable(geometryc)
-
 # Grab the geometryc source files
 file(
 	GLOB_RECURSE
@@ -19,8 +17,8 @@ file(
 	#
 	${MESHOPTIMIZER_SOURCES}
 )
+add_executable(geometryc ${GEOMETRYC_SOURCES})
 
-target_sources(geometryc PRIVATE ${GEOMETRYC_SOURCES})
 target_include_directories(geometryc PRIVATE ${MESHOPTIMIZER_INCLUDE_DIR})
 target_link_libraries(geometryc PRIVATE bx bgfx-vertexlayout ${MESHOPTIMIZER_LIBRARIES})
 target_compile_definitions(geometryc PRIVATE "-D_CRT_SECURE_NO_WARNINGS")
@@ -29,10 +27,17 @@ set_target_properties(
 						 OUTPUT_NAME ${BGFX_TOOLS_PREFIX}geometryc #
 )
 
-if(BGFX_BUILD_TOOLS_GEOMETRY AND BGFX_CUSTOM_TARGETS)
-	add_dependencies(tools geometryc)
+if(BGFX_BUILD_TOOLS_GEOMETRY)
+	add_executable(bgfx::geometryc ALIAS geometryc)
+	if(BGFX_CUSTOM_TARGETS)
+		add_dependencies(tools geometryc)
+	endif()
 endif()
 
 if(IOS)
 	set_target_properties(geometryc PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_GUI_IDENTIFIER geometryc)
 endif()
+
+if(BGFX_INSTALL)
+	install(TARGETS geometryc EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()

cmake/bgfx/geometryv.cmake

@@ -8,18 +8,17 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-if(ANDROID)
-	add_library(geometryv SHARED)
-else()
-	add_executable(geometryv)
-endif()
-
 # Grab the geometryv source files
 file(GLOB_RECURSE GEOMETRYV_SOURCES #
 	 ${BGFX_DIR}/tools/geometryv/*
 )
 
-target_sources(geometryv PRIVATE ${GEOMETRYV_SOURCES})
+if(ANDROID)
+	add_library(geometryv SHARED ${GEOMETRYV_SOURCES})
+else()
+	add_executable(geometryv ${GEOMETRYV_SOURCES})
+endif()
+
 target_link_libraries(geometryv PRIVATE example-common)
 set_target_properties(
 	geometryv PROPERTIES FOLDER "bgfx/tools" #
@@ -37,3 +36,7 @@ elseif(EMSCRIPTEN)
 elseif(IOS)
 	set_target_properties(geometryv PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_GUI_IDENTIFIER geometryv)
 endif()
+
+if(BGFX_INSTALL)
+	install(TARGETS geometryv EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()

cmake/bgfx/shaderc.cmake

@@ -8,17 +8,16 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-add_executable(shaderc)
+# Grab the shaderc source files
+file(
+	GLOB
+	SHADERC_SOURCES #
+	${BGFX_DIR}/tools/shaderc/*.cpp #
+	${BGFX_DIR}/tools/shaderc/*.h #
+	${BGFX_DIR}/src/shader* #
+)
 
-#target_include_directories(
-#	shaderc
-#	PRIVATE
-#    ${BIMG_DIR}/include #
-#    ${GLSL_OPTIMIZER}/include #
-#    ${GLSL_OPTIMIZER}/src/mesa #
-#    ${GLSL_OPTIMIZER}/src/mapi #
-#    ${GLSL_OPTIMIZER}/src/glsl #
-#)
+add_executable(shaderc ${SHADERC_SOURCES})
 
 target_link_libraries(
 	shaderc
@@ -46,24 +45,16 @@ if(BGFX_AMALGAMATED)
 	target_link_libraries(shaderc PRIVATE bgfx-shader)
 endif()
 
-# Grab the shaderc source files
-file(
-	GLOB
-	SHADERC_SOURCES #
-	${BGFX_DIR}/tools/shaderc/*.cpp #
-	${BGFX_DIR}/tools/shaderc/*.h #
-	${BGFX_DIR}/src/shader* #
-)
-
-target_sources(shaderc PRIVATE ${SHADERC_SOURCES})
-
 set_target_properties(
 	shaderc PROPERTIES FOLDER "bgfx/tools" #
 					   OUTPUT_NAME ${BGFX_TOOLS_PREFIX}shaderc #
 )
 
-if(BGFX_BUILD_TOOLS_SHADER AND BGFX_CUSTOM_TARGETS)
-	add_dependencies(tools shaderc)
+if(BGFX_BUILD_TOOLS_SHADER)
+	add_executable(bgfx::shaderc ALIAS shaderc)
+	if(BGFX_CUSTOM_TARGETS)
+		add_dependencies(tools shaderc)
+	endif()
 endif()
 
 if(ANDROID)
@@ -71,3 +62,7 @@ if(ANDROID)
 elseif(IOS)
 	set_target_properties(shaderc PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_GUI_IDENTIFIER shaderc)
 endif()
+
+if(BGFX_INSTALL)
+	install(TARGETS shaderc EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()

cmake/bgfx/texturev.cmake

@@ -8,18 +8,17 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-if(ANDROID)
-	add_library(texturev SHARED)
-else()
-	add_executable(texturev)
-endif()
-
 # Grab the texturev source files
 file(GLOB_RECURSE TEXTUREV_SOURCES #
 	 ${BGFX_DIR}/tools/texturev/*
 )
 
-target_sources(texturev PRIVATE ${TEXTUREV_SOURCES})
+if(ANDROID)
+	add_library(texturev SHARED ${TEXTUREV_SOURCES})
+else()
+	add_executable(texturev ${TEXTUREV_SOURCES})
+endif()
+
 target_link_libraries(texturev PRIVATE example-common)
 set_target_properties(
 	texturev PROPERTIES FOLDER "bgfx/tools" #
@@ -37,3 +36,7 @@ elseif(EMSCRIPTEN)
 elseif(IOS)
 	set_target_properties(texturev PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_GUI_IDENTIFIER texturev)
 endif()
+
+if(BGFX_INSTALL)
+	install(TARGETS texturev EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()

cmake/bimg/bimg.cmake

@@ -14,17 +14,6 @@ if(NOT IS_DIRECTORY ${BIMG_DIR})
 	return()
 endif()
 
-add_library(bimg STATIC)
-
-# Put in a "bgfx" folder in Visual Studio
-set_target_properties(bimg PROPERTIES FOLDER "bgfx")
-
-target_include_directories(
-	bimg PUBLIC $<BUILD_INTERFACE:${BIMG_DIR}/include>$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-	PRIVATE ${ASTC_ENCODER_INCLUDE_DIR} #
-			${MINIZ_INCLUDE_DIR} #
-)
-
 file(
 	GLOB_RECURSE
 	BIMG_SOURCES
@@ -36,7 +25,16 @@ file(
 	${MINIZ_SOURCES}
 )
 
-target_sources(bimg PRIVATE ${BIMG_SOURCES})
+add_library(bimg STATIC ${BIMG_SOURCES})
+
+# Put in a "bgfx" folder in Visual Studio
+set_target_properties(bimg PROPERTIES FOLDER "bgfx")
+
+target_include_directories(
+	bimg PUBLIC $<BUILD_INTERFACE:${BIMG_DIR}/include>$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+	PRIVATE ${ASTC_ENCODER_INCLUDE_DIR} #
+			${MINIZ_INCLUDE_DIR} #
+)
 
 target_link_libraries(
 	bimg
@@ -44,3 +42,16 @@ target_link_libraries(
 		   ${ASTC_ENCODER_LIBRARIES} #
 		   ${MINIZ_LIBRARIES} #
 )
+
+if(BGFX_INSTALL)
+	install(
+		TARGETS bimg
+		EXPORT "${TARGETS_EXPORT_NAME}"
+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+		INCLUDES
+		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+	)
+	install(DIRECTORY ${BIMG_DIR}/include/bimg DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+endif()

cmake/bimg/bimg_decode.cmake

@@ -14,7 +14,17 @@ if(NOT IS_DIRECTORY ${BIMG_DIR})
 	return()
 endif()
 
-add_library(bimg_decode STATIC)
+file(
+	GLOB_RECURSE
+	BIMG_DECODE_SOURCES #
+	${BIMG_DIR}/include/* #
+	${BIMG_DIR}/src/image_decode.* #
+	#
+	${LOADPNG_SOURCES} #
+	${MINIZ_SOURCES} #
+)
+
+add_library(bimg_decode STATIC ${BIMG_DECODE_SOURCES})
 
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties(bimg_decode PROPERTIES FOLDER "bgfx")
@@ -26,18 +36,6 @@ target_include_directories(
 			${TINYEXR_INCLUDE_DIR} #
 )
 
-file(
-	GLOB_RECURSE
-	BIMG_DECODE_SOURCES #
-	${BIMG_DIR}/include/* #
-	${BIMG_DIR}/src/image_decode.* #
-	#
-	${LOADPNG_SOURCES} #
-	${MINIZ_SOURCES} #
-)
-
-target_sources(bimg_decode PRIVATE ${BIMG_DECODE_SOURCES})
-
 target_link_libraries(
 	bimg_decode
 	PUBLIC bx #
@@ -45,3 +43,15 @@ target_link_libraries(
 		   ${MINIZ_LIBRARIES} #
 		   ${TINYEXR_LIBRARIES} #
 )
+
+if(BGFX_INSTALL AND NOT BGFX_LIBRARY_TYPE MATCHES "SHARED")
+	install(
+		TARGETS bimg_decode
+		EXPORT "${TARGETS_EXPORT_NAME}"
+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+		INCLUDES
+		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+	)
+endif()

cmake/bimg/bimg_encode.cmake

@@ -85,3 +85,15 @@ foreach(flag "-Wno-class-memaccess" "-Wno-deprecated-copy")
 		endforeach()
 	endif()
 endforeach()
+
+if(BGFX_INSTALL AND NOT BGFX_LIBRARY_TYPE MATCHES "SHARED")
+	install(
+		TARGETS bimg_encode
+		EXPORT "${TARGETS_EXPORT_NAME}"
+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+		INCLUDES
+		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+	)
+endif()

cmake/bimg/texturec.cmake

@@ -8,23 +8,25 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-add_executable(texturec)
-
 # Grab the texturec source files
 file(GLOB_RECURSE TEXTUREC_SOURCES #
 	 ${BIMG_DIR}/tools/texturec/*.cpp #
 	 ${BIMG_DIR}/tools/texturec/*.h #
 )
 
-target_sources(texturec PRIVATE ${TEXTUREC_SOURCES})
+add_executable(texturec ${TEXTUREC_SOURCES})
+
 target_link_libraries(texturec PRIVATE bimg_decode bimg_encode bimg)
 set_target_properties(
 	texturec PROPERTIES FOLDER "bgfx/tools" #
 						OUTPUT_NAME ${BGFX_TOOLS_PREFIX}texturec #
 )
 
-if(BGFX_BUILD_TOOLS_TEXTURE AND BGFX_CUSTOM_TARGETS)
-	add_dependencies(tools texturec)
+if(BGFX_BUILD_TOOLS_TEXTURE)
+	add_executable(bgfx::texturec ALIAS texturec)
+	if(BGFX_CUSTOM_TARGETS)
+		add_dependencies(tools texturec)
+	endif()
 endif()
 
 if(ANDROID)
@@ -32,3 +34,7 @@ if(ANDROID)
 elseif(IOS)
 	set_target_properties(texturec PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_GUI_IDENTIFIER texturec)
 endif()
+
+if(BGFX_INSTALL)
+	install(TARGETS texturec EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()

cmake/bx/CMakeLists.txt

@@ -15,8 +15,6 @@ if(BGFX_BUILD_TOOLS_BIN2C)
 endif()
 
 if(BGFX_BUILD_TESTS)
-	add_executable(bx_test)
-	target_compile_definitions(bx_test PRIVATE CATCH_AMALGAMATED_CUSTOM_MAIN)
 	file(
 		GLOB
 		BX_TEST_SOURCES #
@@ -25,11 +23,11 @@ if(BGFX_BUILD_TESTS)
 		${BX_DIR}/tests/*.h #
 		${BX_DIR}/tests/dbg.* #
 	)
-	target_sources(bx_test PRIVATE ${BX_TEST_SOURCES})
+	add_executable(bx_test ${BX_TEST_SOURCES})
+	target_compile_definitions(bx_test PRIVATE CATCH_AMALGAMATED_CUSTOM_MAIN)
 	target_link_libraries(bx_test PRIVATE bx)
 	add_test(NAME bx.test COMMAND bx_test)
 
-	add_executable(bx_bench)
 	file(
 		GLOB
 		BX_BENCH_SOURCES #
@@ -37,7 +35,7 @@ if(BGFX_BUILD_TESTS)
 		${BX_DIR}/tests/*_bench.h #
 		${BX_DIR}/tests/dbg.* #
 	)
-	target_sources(bx_bench PRIVATE ${BX_BENCH_SOURCES})
+	add_executable(bx_bench ${BX_BENCH_SOURCES})
 	target_link_libraries(bx_bench PRIVATE bx)
 	add_test(NAME bx.bench COMMAND bx_bench)
 endif()

cmake/bx/bin2c.cmake

@@ -8,23 +8,25 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-add_executable(bin2c)
-
 # Grab the bin2c source files
 file(GLOB_RECURSE BIN2C_SOURCES #
 	 ${BX_DIR}/tools/bin2c/*.cpp #
 	 ${BX_DIR}/tools/bin2c/*.h #
 )
 
-target_sources(bin2c PRIVATE ${BIN2C_SOURCES})
+add_executable(bin2c ${BIN2C_SOURCES})
+
 target_link_libraries(bin2c PRIVATE bx)
 set_target_properties(
 	bin2c PROPERTIES FOLDER "bgfx/tools" #
 					 OUTPUT_NAME ${BGFX_TOOLS_PREFIX}bin2c #
 )
 
-if(BGFX_BUILD_TOOLS_BIN2C AND BGFX_CUSTOM_TARGETS)
-	add_dependencies(tools bin2c)
+if(BGFX_BUILD_TOOLS_BIN2C)
+	add_executable(bgfx::bin2c ALIAS bin2c)
+	if(BGFX_CUSTOM_TARGETS)
+		add_dependencies(tools bin2c)
+	endif()
 endif()
 
 if(ANDROID)
@@ -32,3 +34,7 @@ if(ANDROID)
 elseif(IOS)
 	set_target_properties(bin2c PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_GUI_IDENTIFIER bin2c)
 endif()
+
+if(BGFX_INSTALL)
+	install(TARGETS bin2c EXPORT "${TARGETS_EXPORT_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()

cmake/bx/bx.cmake

@@ -16,32 +16,6 @@ endif()
 
 include(GNUInstallDirs)
 
-add_library(bx STATIC)
-
-# Put in a "bgfx" folder in Visual Studio
-set_target_properties(bx PROPERTIES FOLDER "bgfx")
-
-# Build system specific configurations
-if(MINGW)
-	set(BX_COMPAT_PLATFORM mingw)
-elseif(WIN32)
-	set(BX_COMPAT_PLATFORM msvc)
-elseif(APPLE) # APPLE is technically UNIX... ORDERING MATTERS!
-	set(BX_COMPAT_PLATFORM osx)
-elseif(UNIX)
-	set(BX_COMPAT_PLATFORM linux)
-endif()
-
-# Add include directory of bx
-target_include_directories(
-	bx
-	PUBLIC $<BUILD_INTERFACE:${BX_DIR}/include> #
-		   $<BUILD_INTERFACE:${BX_DIR}/3rdparty> #
-		   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> #
-		   $<BUILD_INTERFACE:${BX_DIR}/include/compat/${BX_COMPAT_PLATFORM}> #
-		   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/compat/${BX_COMPAT_PLATFORM}> #
-)
-
 # Grab the bx source files
 file(
 	GLOB_RECURSE
@@ -84,8 +58,31 @@ foreach(BX_SRC ${BX_NOBUILD})
 	set_source_files_properties(${BX_SRC} PROPERTIES HEADER_FILE_ONLY ON)
 endforeach()
 
-# Add sources to the project
-target_sources(bx PRIVATE ${BX_SOURCES})
+add_library(bx STATIC ${BX_SOURCES})
+
+# Put in a "bgfx" folder in Visual Studio
+set_target_properties(bx PROPERTIES FOLDER "bgfx")
+
+# Build system specific configurations
+if(MINGW)
+	set(BX_COMPAT_PLATFORM mingw)
+elseif(WIN32)
+	set(BX_COMPAT_PLATFORM msvc)
+elseif(APPLE) # APPLE is technically UNIX... ORDERING MATTERS!
+	set(BX_COMPAT_PLATFORM osx)
+elseif(UNIX)
+	set(BX_COMPAT_PLATFORM linux)
+endif()
+
+# Add include directory of bx
+target_include_directories(
+	bx
+	PUBLIC $<BUILD_INTERFACE:${BX_DIR}/include> #
+		   $<BUILD_INTERFACE:${BX_DIR}/3rdparty> #
+		   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> #
+		   $<BUILD_INTERFACE:${BX_DIR}/include/compat/${BX_COMPAT_PLATFORM}> #
+		   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/bx/compat/${BX_COMPAT_PLATFORM}> #
+)
 
 # All configurations
 target_compile_definitions(bx PUBLIC "BX_CONFIG_DEBUG=$<IF:$<CONFIG:Debug>,1,$<BOOL:${BX_CONFIG_DEBUG}>>")
@@ -123,3 +120,19 @@ endif()
 
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties(bx PROPERTIES FOLDER "bgfx")
+
+if(BGFX_INSTALL)
+	install(
+		TARGETS bx
+		EXPORT "${TARGETS_EXPORT_NAME}"
+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+	)
+	# We will make sure tinystl and compat are not installed in /usr/include
+	install(DIRECTORY "${BX_DIR}/include/bx" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+	install(DIRECTORY "${BX_DIR}/include/compat/${BX_COMPAT_PLATFORM}"
+			DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/bx/compat"
+	)
+	install(DIRECTORY "${BX_DIR}/include/tinystl" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/bx")
+endif()

cmake/version.cmake

@@ -23,7 +23,7 @@ execute_process(
 	COMMAND "${GIT_EXECUTABLE}" -C bgfx rev-list --count HEAD
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 	OUTPUT_VARIABLE GIT_REV_COUNT
-	ERROR_QUIET
+	OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
 )
 
 # read version(100) from bgfx.idl