From 560dcb227e92642dfbd1c9f97d1127780526e0c0 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Fri, 14 Jul 2023 16:58:09 -0400 Subject: [PATCH] always run _bgfx_crosscompile_use_host_tool --- cmake/Config.cmake.in | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in index 9a9eaaef..cb9342a2 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in @@ -9,28 +9,26 @@ 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 - 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 /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() - _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@")