Skip to content

Commit 4857e70

Browse files
MarkY-LunarGMarkY-LunarG
committedNov 27, 2023
Make toCPP conditional in CMake
1) Make the build of the `ToCpp` source conditional based on the makefile flag `GFXRECON_TOCPP_SUPPORT`. If this is set to `ON`, it will build the source. Otherwise, it will not build the files. This is because the software is considered to be in an Alpha state. 2) Make some more coding standards adjustments. 3) Modified argument handling in the tocpp `main.cpp` source file 4) Update the README.md in the `tocpp` tools folder to detail how to use the tool and what the current limitations are.
1 parent 7ace46d commit 4857e70

26 files changed

+8039
-7910
lines changed
 

‎CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ if(${GFXRECON_ENABLE_RELEASE_ASSERTS})
118118
add_definitions(-DGFXRECON_ENABLE_RELEASE_ASSERTS)
119119
endif()
120120

121+
option(GFXRECON_TOCPP_SUPPORT "Build ToCpp export tool as part of GFXReconstruct builds." OFF)
122+
121123
if(MSVC)
122124

123125
# The host toolchain architecture (i.e. are the compiler and other tools compiled to ARM/Intel 32bit/64bit binaries):

‎framework/decode/CMakeLists.txt

+22-24
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,20 @@ target_sources(gfxrecon_decode
8888
${CMAKE_CURRENT_LIST_DIR}/struct_pointer_decoder.h
8989
${CMAKE_CURRENT_LIST_DIR}/swapchain_image_tracker.h
9090
${CMAKE_CURRENT_LIST_DIR}/value_decoder.h
91-
${CMAKE_CURRENT_LIST_DIR}/marker_consumer_base.h
92-
${CMAKE_CURRENT_LIST_DIR}/metadata_consumer_base.h
93-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_consumer_base.h
94-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_consumer_base.cpp
95-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_loader_generator.h
96-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_loader_generator.cpp
97-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_pre_process_consumer_base.h
98-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_pre_process_consumer_base.cpp
99-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_resource_tracker.h
100-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_resource_tracker.cpp
101-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_structs.h
102-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_structs.cpp
103-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_utilities.h
104-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_utilities.cpp
105-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_util_datapack.h
106-
${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_util_datapack.cpp
91+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_consumer_base.h>
92+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_consumer_base.cpp>
93+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_loader_generator.h>
94+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_loader_generator.cpp>
95+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_pre_process_consumer_base.h>
96+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_pre_process_consumer_base.cpp>
97+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_resource_tracker.h>
98+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_resource_tracker.cpp>
99+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_structs.h>
100+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_structs.cpp>
101+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_utilities.h>
102+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_utilities.cpp>
103+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_util_datapack.h>
104+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/vulkan_cpp_util_datapack.cpp>
107105
${CMAKE_CURRENT_LIST_DIR}/vulkan_consumer_base.h
108106
${CMAKE_CURRENT_LIST_DIR}/vulkan_stats_consumer.h
109107
${CMAKE_CURRENT_LIST_DIR}/stat_decoder_base.h
@@ -185,15 +183,15 @@ target_sources(gfxrecon_decode
185183
${CMAKE_CURRENT_LIST_DIR}/vulkan_offscreen_swapchain.h
186184
${CMAKE_CURRENT_LIST_DIR}/vulkan_offscreen_swapchain.cpp
187185
${CMAKE_CURRENT_LIST_DIR}/window.h
188-
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_consumer.h
189-
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_consumer.cpp
190-
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_pre_process_consumer.h
191-
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_pre_process_consumer.cpp
186+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_consumer.h>
187+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_consumer.cpp>
188+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_pre_process_consumer.h>
189+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_pre_process_consumer.cpp>
190+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_structs.h>
191+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_structs.cpp>
192+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_consumer_extension.h>
193+
$<$<BOOL:${GFXRECON_TOCPP_SUPPORT}>:${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_consumer_extension.cpp>
192194
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_consumer.h
193-
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_structs.h
194-
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_structs.cpp
195-
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_consumer_extension.h
196-
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_cpp_consumer_extension.cpp
197195
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_decoder.h
198196
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_decoder.cpp
199197
${CMAKE_SOURCE_DIR}/framework/generated/generated_vulkan_enum_to_json.h

0 commit comments

Comments
 (0)