Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Support granular selection of tools to build #60

Closed
wants to merge 3 commits into from
Closed

Support granular selection of tools to build #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50e3f13
Support granular selection of tools to build
Qix- Sep 18, 2019
04c05c5
pin tide versions
Qix- Jan 9, 2020
9c3df58
update bgfx
Qix- Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "bgfx"]
path = bgfx
url = https://github.com/bkaradzic/bgfx.git
url = https://github.com/tidemmo/bgfx.git
[submodule "bx"]
path = bx
url = https://github.com/bkaradzic/bx.git
url = https://github.com/tidemmo/bx.git
[submodule "bimg"]
path = bimg
url = https://github.com/bkaradzic/bimg.git
url = https://github.com/tidemmo/bimg.git
50 changes: 37 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,21 @@ if( APPLE AND NOT IOS )
set( CMAKE_CXX_FLAGS "-ObjC++" )
endif()

option( BGFX_BUILD_TOOLS "Build bgfx tools." ON )
option( BGFX_BUILD_EXAMPLES "Build bgfx examples." ON )
option( BGFX_INSTALL "Create installation target." ON )
option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes." OFF )
option( BGFX_CUSTOM_TARGETS "Include convenience custom targets." ON )
option( BGFX_USE_OVR "Build with OVR support." OFF )
option( BGFX_AMALGAMATED "Amalgamated bgfx build for faster compilation" OFF )
option( BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF )
option( BGFX_CONFIG_DEBUG "Enables debug configuration on all builds" OFF )
option( BGFX_USE_DEBUG_SUFFIX "Add 'd' suffix to debug output targets" ON )
# Disable BGFX_BUILD_TOOLS in order to specify specific tools to build.
option( BGFX_BUILD_TOOLS "Build all bgfx tools (overwrites all)." ON )
option( BGFX_BUILD_TOOL_TEXTUREV "Build bgfx tool: texturev" ${BGFX_BUILD_TOOLS} )
option( BGFX_BUILD_TOOL_TEXTUREC "Build bgfx tool: texturec" ${BGFX_BUILD_TOOLS} )
option( BGFX_BUILD_TOOL_SHADERC "Build bgfx tool: shaderc" ${BGFX_BUILD_TOOLS} )
option( BGFX_BUILD_TOOL_GEOMETRYC "Build bgfx tool: geometryc" ${BGFX_BUILD_TOOLS} )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the idiomatic thing to do here is using cmake_dependent_option:

cmake_dependent_option(BGFX_BUILD_TOOL_TEXTUREV "Build bgfx tool: texturev" ON
                       "BGFX_BUILD_TOOLS" OFF)
cmake_dependent_option(BGFX_BUILD_TOOL_TEXTUREC "Build bgfx tool: texturec" ON
                       "BGFX_BUILD_TOOLS" OFF)
cmake_dependent_option(BGFX_BUILD_TOOL_SHADERC "Build bgfx tool: shaderc" ON
                       "BGFX_BUILD_TOOLS" OFF)
cmake_dependent_option(BGFX_BUILD_TOOL_GEOMETRYC "Build bgfx tool: geometryc" ON
                       "BGFX_BUILD_TOOLS" OFF)

https://cmake.org/cmake/help/v3.15/module/CMakeDependentOption.html#module:CMakeDependentOption

Copy link
Author

@Qix- Qix- Jan 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd have to bump the minimum CMake version in order to use that. If @JoshuaBrookover is okay with that, then this is indeed the correct way to do this.

Disregard.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's supported by CMake 3.0 as well, no reason to bump version

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch @pezcode.

option( BGFX_BUILD_EXAMPLES "Build bgfx examples." ON )
option( BGFX_INSTALL "Create installation target." ON )
option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes." OFF )
option( BGFX_CUSTOM_TARGETS "Include convenience custom targets." ON )
option( BGFX_USE_OVR "Build with OVR support." OFF )
option( BGFX_AMALGAMATED "Amalgamated bgfx build for faster compilation" OFF )
option( BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF )
option( BGFX_CONFIG_DEBUG "Enables debug configuration on all builds" OFF )
option( BGFX_USE_DEBUG_SUFFIX "Add 'd' suffix to debug output targets" ON )
set( BGFX_OPENGL_VERSION "" CACHE STRING "Specify minimum opengl version" )

if( NOT BX_DIR )
Expand Down Expand Up @@ -57,11 +62,30 @@ include( cmake/bx.cmake )
include( cmake/bimg.cmake )
include( cmake/bgfx.cmake )

if( BGFX_BUILD_TOOLS )
include( cmake/tools.cmake )
if( BGFX_CUSTOM_TARGETS )
add_custom_target( tools )

This comment was marked as resolved.

Sign in to view

This comment was marked as resolved.

Sign in to view

set_target_properties( tools PROPERTIES FOLDER "bgfx/tools" )
endif()

include( cmake/examples.cmake )
if( BGFX_BUILD_TOOL_GEOMETRYC )
include( cmake/tools/geometryc.cmake )
endif()

if( BGFX_BUILD_TOOL_SHADERC )
include( cmake/tools/shaderc.cmake )
endif()

if( BGFX_BUILD_TOOL_TEXTUREC )
include( cmake/tools/texturec.cmake )
endif()

if( BGFX_BUILD_TOOL_TEXTUREV )
include( cmake/tools/texturev.cmake )
endif()

if( BGFX_BUILD_EXAMPLES )
include( cmake/examples.cmake )
endif()

if( BGFX_INSTALL )
include(GNUInstallDirs)
Expand Down
2 changes: 1 addition & 1 deletion bgfx
Open in desktop
Submodule bgfx updated 5532 files
2 changes: 1 addition & 1 deletion bimg
Open in desktop
Submodule bimg updated 23 files
+2 −1 .appveyor.yml
+1 −0 3rdparty/astc-codec/src/base/string_utils.h
+1 −1 3rdparty/nvtt/nvtt.cpp
+176 −51 3rdparty/tinyexr/tinyexr.h
+1 −1 LICENSE
+1 −1 README.md
+1 −1 include/bimg/bimg.h
+1 −1 include/bimg/decode.h
+1 −1 include/bimg/encode.h
+1 −10 makefile
+1 −1 scripts/bimg.lua
+1 −1 scripts/bimg_decode.lua
+1 −1 scripts/bimg_encode.lua
+1 −1 scripts/genie.lua
+1 −1 scripts/texturec.lua
+4 −2 src/bimg_p.h
+59 −0 src/config.h
+630 −496 src/image.cpp
+1 −1 src/image_cubemap_filter.cpp
+1 −1 src/image_decode.cpp
+1 −1 src/image_encode.cpp
+1 −1 src/image_gnf.cpp
+2 −2 tools/texturec/texturec.cpp
2 changes: 1 addition & 1 deletion bx
Open in desktop
Submodule bx updated 129 files
19 changes: 0 additions & 19 deletions cmake/tools.cmake
View file
Open in desktop

This file was deleted.