From 9ae143b350dea05f6e7599f8489db97d30a5f7e8 Mon Sep 17 00:00:00 2001 From: Matthew Albrecht Date: Tue, 22 Jun 2021 02:29:33 +0100 Subject: [PATCH 1/2] Use BGFX_DIR relative path when reading version. --- cmake/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/version.cmake b/cmake/version.cmake index 2bf256b..a3aea8c 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -23,7 +23,7 @@ execute_process(COMMAND "${GIT_EXECUTABLE}" -C bgfx rev-list --count HEAD ERROR_QUIET) # read version(100) from bgfx.idl -file(READ "${CMAKE_CURRENT_SOURCE_DIR}/bgfx/scripts/bgfx.idl" BGFX_IDL) +file(READ "${BGFX_DIR}/scripts/bgfx.idl" BGFX_IDL) string(REGEX MATCH "version\\(([^\)]+)\\)" BGFX_API_VERSION ${BGFX_IDL}) set(BGFX_API_VERSION ${CMAKE_MATCH_1}) From 3441d13ca2770f6f7cb1f060e3b0a9d267741bab Mon Sep 17 00:00:00 2001 From: Matthew Albrecht Date: Fri, 25 Jun 2021 16:22:40 +0100 Subject: [PATCH 2/2] Include `cmake/version.cmake` after set(BX_DIR). --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce0b016..a524f64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,6 @@ cmake_minimum_required( VERSION 3.0 ) project(bgfx) -# sets project version from api ver / git rev -include( cmake/version.cmake ) - set_property( GLOBAL PROPERTY USE_FOLDERS ON ) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -60,6 +57,9 @@ elseif( NOT IS_ABSOLUTE "${BGFX_DIR}") get_filename_component(BGFX_DIR "${BGFX_DIR}" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") endif() +# sets project version from api ver / git rev +include( cmake/version.cmake ) + include( cmake/shared.cmake ) include( cmake/bx.cmake ) include( cmake/bimg.cmake )