Merge pull request #114 from recisio/cmake_include_paths

CMake more precise includes path
Merge pull request #120 from bkaradzic/dependabot/submodules/bgfx-9f04292
2026-02-17 21:12:35 +01:00 · 2022-01-31 21:26:30 +03:00 · 2022-01-31 20:56:20 +03:00 · 2022-01-31 17:16:26 +00:00 · 2022-01-07 10:57:18 +01:00
8 changed files with 35 additions and 35 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,19 +57,19 @@ elseif( NOT IS_ABSOLUTE "${BGFX_DIR}")
 endif()

 # sets project version from api ver / git rev
-include( cmake/version.cmake )
+include( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake )

-include( cmake/shared.cmake )
-include( cmake/bx.cmake )
-include( cmake/bimg.cmake )
-include( cmake/bgfx.cmake )
+include( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/shared.cmake )
+include( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/bx.cmake )
+include( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/bimg.cmake )
+include( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/bgfx.cmake )

 if( BGFX_BUILD_TOOLS )
-	include( cmake/tools.cmake )
+	include( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/tools.cmake )
 endif()

 if( BGFX_BUILD_TOOLS OR BGFX_BUILD_EXAMPLES )
-	include( cmake/examples.cmake )
+	include( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/examples.cmake )
 endif()

 if( BGFX_INSTALL )
@@ -110,7 +110,7 @@ if( BGFX_INSTALL )
 	#   * TARGETS_EXPORT_NAME
 	#   * PROJECT_NAME
 	configure_package_config_file(
-		"cmake/Config.cmake.in"
+		"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in"
 		"${project_config}"
 		INSTALL_DESTINATION "${config_install_dir}"
 	)
--- a/2
+++ b/2
--- a/cmake/bgfx.cmake
+++ b/cmake/bgfx.cmake
@@ -47,7 +47,7 @@ else()
 endif()

 if(BGFX_CONFIG_RENDERER_WEBGPU)
-    include(cmake/3rdparty/webgpu.cmake)
+    include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/webgpu.cmake)
    target_compile_definitions( bgfx PRIVATE BGFX_CONFIG_RENDERER_WEBGPU=1)
    if (EMSCRIPTEN)
        target_link_options(bgfx PRIVATE "-s USE_WEBGPU=1")
--- a/cmake/bimg.cmake
+++ b/cmake/bimg.cmake
@@ -9,16 +9,16 @@
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

 # Third party libs
-include( cmake/3rdparty/astc-codec.cmake )
-include( cmake/3rdparty/astc.cmake )
-include( cmake/3rdparty/edtaa3.cmake )
-include( cmake/3rdparty/etc1.cmake )
-include( cmake/3rdparty/etc2.cmake )
-include( cmake/3rdparty/iqa.cmake )
-include( cmake/3rdparty/libsquish.cmake )
-include( cmake/3rdparty/nvtt.cmake )
-include( cmake/3rdparty/pvrtc.cmake )
-include( cmake/3rdparty/tinyexr.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc-codec.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/edtaa3.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc1.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc2.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/iqa.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/libsquish.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/nvtt.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pvrtc.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/tinyexr.cmake )

 # Ensure the directory exists
 if( NOT IS_DIRECTORY ${BIMG_DIR} )
--- a/cmake/examples.cmake
+++ b/cmake/examples.cmake
@@ -10,10 +10,10 @@

 include( CMakeParseArguments )

-include( cmake/util/ConfigureDebugging.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/util/ConfigureDebugging.cmake )

-include( cmake/3rdparty/dear-imgui.cmake )
-include( cmake/3rdparty/meshoptimizer.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/dear-imgui.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/meshoptimizer.cmake )

 function( add_bgfx_shader FILE FOLDER )
 	get_filename_component( FILENAME "${FILE}" NAME_WE )
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -13,8 +13,8 @@ if( BGFX_CUSTOM_TARGETS )
 	set_target_properties( tools PROPERTIES FOLDER "bgfx/tools" )
 endif()

-include( cmake/tools/geometryc.cmake )
-include( cmake/tools/geometryv.cmake )
-include( cmake/tools/shaderc.cmake )
-include( cmake/tools/texturec.cmake )
-include( cmake/tools/texturev.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/tools/geometryc.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/tools/geometryv.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/tools/shaderc.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/tools/texturec.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/tools/texturev.cmake )
--- a/cmake/tools/geometryc.cmake
+++ b/cmake/tools/geometryc.cmake
@@ -10,7 +10,7 @@

 include( CMakeParseArguments )

-include( cmake/3rdparty/meshoptimizer.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/meshoptimizer.cmake )

 add_executable( geometryc ${BGFX_DIR}/tools/geometryc/geometryc.cpp )
 target_compile_definitions( geometryc PRIVATE "-D_CRT_SECURE_NO_WARNINGS" )
--- a/cmake/tools/shaderc.cmake
+++ b/cmake/tools/shaderc.cmake
@@ -10,12 +10,12 @@

 include( CMakeParseArguments )

-include( cmake/3rdparty/fcpp.cmake )
-include( cmake/3rdparty/glsl-optimizer.cmake )
-include( cmake/3rdparty/glslang.cmake )
-include( cmake/3rdparty/spirv-cross.cmake )
-include( cmake/3rdparty/spirv-tools.cmake )
-include( cmake/3rdparty/webgpu.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/fcpp.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/glsl-optimizer.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/glslang.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/spirv-cross.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/spirv-tools.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/webgpu.cmake )

 add_executable( shaderc ${BGFX_DIR}/tools/shaderc/shaderc.cpp ${BGFX_DIR}/tools/shaderc/shaderc.h ${BGFX_DIR}/tools/shaderc/shaderc_glsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_hlsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_pssl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_spirv.cpp ${BGFX_DIR}/tools/shaderc/shaderc_metal.cpp )
 target_compile_definitions( shaderc PRIVATE "-D_CRT_SECURE_NO_WARNINGS" )
Author	SHA1	Message	Date
loanselot	b44793b740	Merge pull request #114 from recisio/cmake_include_paths CMake more precise includes path	2022-01-31 21:26:30 +03:00
loanselot	1b74840891	Merge pull request #120 from bkaradzic/dependabot/submodules/bgfx-9f04292 Bump bgfx from `cd2030c` to `9f04292`	2022-01-31 20:56:20 +03:00
dependabot[bot]	b193a31651	Bump bgfx from `cd2030c` to `9f04292` Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `cd2030c` to `9f04292`. - [Release notes](https://github.com/bkaradzic/bgfx/releases) - [Commits](`cd2030cc11...9f04292f40`) --- updated-dependencies: - dependency-name: bgfx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-31 17:16:26 +00:00
alexandrebeaudet	72bc1cf167	CMake more precise includes path (in order to use some functions externally)	2022-01-07 10:57:18 +01:00