Merge pull request #15 from mattparks/patch-1

Use BGFX_DIR relative path when reading version.
This commit is contained in:
e-erdal
2021-06-26 13:28:09 +03:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -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 )

View File

@@ -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})