From 487fa0c63b65f43d30378ee7c4b51136789e2cb6 Mon Sep 17 00:00:00 2001 From: Hristo Stamenov Date: Mon, 1 May 2023 22:07:02 +0300 Subject: [PATCH] Refactored the conditions a bit --- cmake/bgfx/geometryc.cmake | 9 +++------ cmake/bgfx/shaderc.cmake | 9 +++------ cmake/bimg/texturec.cmake | 9 +++------ cmake/bx/bin2c.cmake | 9 +++------ 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/cmake/bgfx/geometryc.cmake b/cmake/bgfx/geometryc.cmake index 31684db..e6efcd5 100644 --- a/cmake/bgfx/geometryc.cmake +++ b/cmake/bgfx/geometryc.cmake @@ -27,13 +27,10 @@ set_target_properties( OUTPUT_NAME ${BGFX_TOOLS_PREFIX}geometryc # ) -if(BGFX_BUILD_TOOLS_GEOMETRY AND BGFX_CUSTOM_TARGETS) - add_dependencies(tools geometryc) -endif() - if(BGFX_BUILD_TOOLS_GEOMETRY) - if(TARGET geometryc AND NOT TARGET bgfx::geometryc) - add_executable(bgfx::geometryc ALIAS geometryc) + add_executable(bgfx::geometryc ALIAS geometryc) + if(BGFX_CUSTOM_TARGETS) + add_dependencies(tools geometryc) endif() endif() diff --git a/cmake/bgfx/shaderc.cmake b/cmake/bgfx/shaderc.cmake index 998c531..0f50eab 100644 --- a/cmake/bgfx/shaderc.cmake +++ b/cmake/bgfx/shaderc.cmake @@ -50,13 +50,10 @@ set_target_properties( OUTPUT_NAME ${BGFX_TOOLS_PREFIX}shaderc # ) -if(BGFX_BUILD_TOOLS_SHADER AND BGFX_CUSTOM_TARGETS) - add_dependencies(tools shaderc) -endif() - if(BGFX_BUILD_TOOLS_SHADER) - if(TARGET shaderc AND NOT TARGET bgfx::shaderc) - add_executable(bgfx::shaderc ALIAS shaderc) + add_executable(bgfx::shaderc ALIAS shaderc) + if(BGFX_CUSTOM_TARGETS) + add_dependencies(tools shaderc) endif() endif() diff --git a/cmake/bimg/texturec.cmake b/cmake/bimg/texturec.cmake index d7e67aa..b6f7cac 100644 --- a/cmake/bimg/texturec.cmake +++ b/cmake/bimg/texturec.cmake @@ -22,13 +22,10 @@ set_target_properties( OUTPUT_NAME ${BGFX_TOOLS_PREFIX}texturec # ) -if(BGFX_BUILD_TOOLS_TEXTURE AND BGFX_CUSTOM_TARGETS) - add_dependencies(tools texturec) -endif() - if(BGFX_BUILD_TOOLS_TEXTURE) - if(TARGET texturec AND NOT TARGET bgfx::texturec) - add_executable(bgfx::texturec ALIAS texturec) + add_executable(bgfx::texturec ALIAS texturec) + if(BGFX_CUSTOM_TARGETS) + add_dependencies(tools texturec) endif() endif() diff --git a/cmake/bx/bin2c.cmake b/cmake/bx/bin2c.cmake index a25e870..3c36159 100644 --- a/cmake/bx/bin2c.cmake +++ b/cmake/bx/bin2c.cmake @@ -22,13 +22,10 @@ set_target_properties( OUTPUT_NAME ${BGFX_TOOLS_PREFIX}bin2c # ) -if(BGFX_BUILD_TOOLS_BIN2C AND BGFX_CUSTOM_TARGETS) - add_dependencies(tools bin2c) -endif() - if(BGFX_BUILD_TOOLS_BIN2C) - if(TARGET bin2c AND NOT TARGET bgfx::bin2c) - add_executable(bgfx::bin2c ALIAS bin2c) + add_executable(bgfx::bin2c ALIAS bin2c) + if(BGFX_CUSTOM_TARGETS) + add_dependencies(tools bin2c) endif() endif()