From 1e2f0ce9aa9396b50fde14a02d098d7c3b1e86f9 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Sat, 14 Jan 2023 20:29:39 -0500 Subject: [PATCH] bgfx: Move texturev config to bgfx dir --- cmake/bgfx/CMakeLists.txt | 4 ++++ cmake/{tools => bgfx}/texturev.cmake | 25 +++++++++++++++---------- cmake/tools.cmake | 4 ---- 3 files changed, 19 insertions(+), 14 deletions(-) rename cmake/{tools => bgfx}/texturev.cmake (72%) diff --git a/cmake/bgfx/CMakeLists.txt b/cmake/bgfx/CMakeLists.txt index e99f29f..be39402 100644 --- a/cmake/bgfx/CMakeLists.txt +++ b/cmake/bgfx/CMakeLists.txt @@ -9,3 +9,7 @@ # this software. If not, see . include(bgfx.cmake) + +if(BGFX_BUILD_TOOLS_TEXTURE) + include(texturev.cmake) +endif() diff --git a/cmake/tools/texturev.cmake b/cmake/bgfx/texturev.cmake similarity index 72% rename from cmake/tools/texturev.cmake rename to cmake/bgfx/texturev.cmake index 0689ebe..00fe5ca 100644 --- a/cmake/tools/texturev.cmake +++ b/cmake/bgfx/texturev.cmake @@ -1,25 +1,30 @@ # bgfx.cmake - bgfx building in cmake # Written in 2017 by Joshua Brookover - +# # To the extent possible under law, the author(s) have dedicated all copyright # and related and neighboring rights to this software to the public domain # worldwide. This software is distributed without any warranty. - +# # You should have received a copy of the CC0 Public Domain Dedication along with # this software. If not, see . -include(CMakeParseArguments) +add_executable(texturev) -add_executable(texturev ${BGFX_DIR}/tools/texturev/texturev.cpp) +# Grab the texturev source files +file(GLOB_RECURSE TEXTUREV_SOURCES # + ${BGFX_DIR}/tools/texturev/* +) + +target_sources(texturev PRIVATE ${TEXTUREV_SOURCES}) +target_link_libraries(texturev PRIVATE example-common) set_target_properties(texturev PROPERTIES FOLDER "bgfx/tools") -target_link_libraries(texturev example-common) -if(EMSCRIPTEN) - target_link_options(texturev PRIVATE -sMAX_WEBGL_VERSION=2) -endif() -if(BGFX_CUSTOM_TARGETS) + +if(BGFX_BUILD_TOOLS AND BGFX_CUSTOM_TARGETS) add_dependencies(tools texturev) endif() -if(IOS) +if(EMSCRIPTEN) + target_link_options(texturev PRIVATE -sMAX_WEBGL_VERSION=2) +elseif(IOS) set_target_properties(texturev PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_GUI_IDENTIFIER texturev) endif() diff --git a/cmake/tools.cmake b/cmake/tools.cmake index 0e619a2..959c28e 100644 --- a/cmake/tools.cmake +++ b/cmake/tools.cmake @@ -16,7 +16,3 @@ if(BGFX_BUILD_TOOLS_GEOMETRY) include(${CMAKE_CURRENT_LIST_DIR}/tools/geometryc.cmake) include(${CMAKE_CURRENT_LIST_DIR}/tools/geometryv.cmake) endif() - -if(BGFX_BUILD_TOOLS_TEXTURE) - include(${CMAKE_CURRENT_LIST_DIR}/tools/texturev.cmake) -endif()