Organize Subprojects into Folders in the IDE (#5934)
* Begin Sorting SubProjects into Folders * Add more subprojects to folders * Add even more subprojects to folders * Add further subprojects to folders * Move the last two projects * Move Resources to a Resources subfolder * Remove spaces to be stylistically coherent * Revert Improper CMake Modifications * Revert erroneous line removals * Only specify sdl2's folder on WIN32 * Add the shader subprojects to a Generated folder * Move shaders to Filament/Shaders
This commit is contained in:
committed by
GitHub
parent
bb5d82fce9
commit
1e3ddd612e
@@ -523,6 +523,9 @@ add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS} ${DATA_BINS}
|
||||
# specify where the public headers of this library are
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
|
||||
# add this subproject to the Filament folder
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Filament)
|
||||
|
||||
# ==================================================================================================
|
||||
# Dependencies
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -224,6 +224,9 @@ add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS})
|
||||
# specify where the public headers of this library are
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
|
||||
# add this subproject to the Filament folder
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Filament)
|
||||
|
||||
# ==================================================================================================
|
||||
# Expose a header-only target to minimize dependencies.
|
||||
# ==================================================================================================
|
||||
@@ -269,6 +272,7 @@ set(DUMMY_SRC "${VKSHADERS_DIR}/dummy.c")
|
||||
add_custom_command(OUTPUT ${DUMMY_SRC} COMMAND echo "//" > ${DUMMY_SRC})
|
||||
|
||||
add_library(vkshaders STATIC ${DUMMY_SRC} ${RESGEN_SOURCE})
|
||||
set_target_properties(vkshaders PROPERTIES FOLDER Filament/Generated)
|
||||
|
||||
# ==================================================================================================
|
||||
# Dependencies
|
||||
@@ -435,6 +439,8 @@ if (APPLE)
|
||||
install(FILES "${BACKEND_TEST_COMBINED_OUTPUT}" DESTINATION lib/${DIST_DIR} RENAME ${BACKEND_TEST_LIB_NAME})
|
||||
install(FILES test/PlatformRunner.h DESTINATION include/backend_test)
|
||||
endif()
|
||||
|
||||
set_target_properties(backend_test PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
if (APPLE AND NOT IOS)
|
||||
@@ -443,5 +449,6 @@ if (APPLE AND NOT IOS)
|
||||
# Because each test case is a separate file, the -force_load flag is necessary to prevent the
|
||||
# linker from removing "unused" symbols.
|
||||
target_link_libraries(backend_test_mac PRIVATE -force_load backend_test)
|
||||
set_target_properties(backend_test_mac PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -11,3 +11,5 @@ set(BENCHMARK_SRCS
|
||||
add_executable(benchmark_filament ${BENCHMARK_SRCS})
|
||||
|
||||
target_link_libraries(benchmark_filament PRIVATE benchmark_main utils math filament)
|
||||
|
||||
set_target_properties(benchmark_filament PROPERTIES FOLDER Benchmarks)
|
||||
|
||||
@@ -49,6 +49,7 @@ if (TNT_DEV)
|
||||
|
||||
target_link_libraries(test_${TARGET} PRIVATE filament gtest)
|
||||
target_compile_options(test_${TARGET} PRIVATE ${COMPILER_FLAGS})
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
|
||||
add_executable(test_depth depth_test.cpp)
|
||||
target_link_libraries(test_depth PRIVATE utils)
|
||||
@@ -60,3 +61,4 @@ add_executable(test_material_parser
|
||||
target_link_libraries(test_material_parser PRIVATE filament gtest)
|
||||
target_compile_options(test_material_parser PRIVATE ${COMPILER_FLAGS})
|
||||
target_include_directories(test_material_parser PRIVATE ${RESOURCE_DIR})
|
||||
set_target_properties(test_material_parser PROPERTIES FOLDER Tests)
|
||||
|
||||
@@ -42,6 +42,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
|
||||
# specify where the public headers of this library are
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(${TARGET} PRIVATE opengl32 gdi32)
|
||||
@@ -62,3 +63,4 @@ endif()
|
||||
# and we're linking against the libraries below, importing their public headers
|
||||
target_link_libraries(test_${TARGET} LINK_PUBLIC ${TARGET})
|
||||
target_link_libraries(test_${TARGET} LINK_PUBLIC gtest)
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
|
||||
@@ -26,6 +26,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_link_libraries(${TARGET} utils math)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# test_bluevk is not supported on mobile or Windows
|
||||
if (NOT ANDROID AND NOT IOS AND NOT WIN32 AND NOT FILAMENT_SKIP_SDL2)
|
||||
|
||||
@@ -31,6 +31,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_link_libraries(${TARGET} PUBLIC math)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
@@ -54,4 +55,5 @@ install(DIRECTORY ${PUBLIC_HDR_DIR}/camutils DESTINATION include)
|
||||
if (NOT ANDROID AND NOT WEBGL AND NOT IOS)
|
||||
add_executable(test_${TARGET} tests/test_camutils.cpp)
|
||||
target_link_libraries(test_${TARGET} PRIVATE camutils gtest)
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
@@ -24,6 +24,7 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
target_link_libraries(${TARGET} utils)
|
||||
target_link_libraries(${TARGET} math)
|
||||
|
||||
@@ -22,6 +22,7 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
|
||||
add_library(${TARGET} ${HDRS} ${SRCS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
target_link_libraries(${TARGET} filabridge utils)
|
||||
|
||||
|
||||
@@ -83,6 +83,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS} ${RESGEN_SOURCE})
|
||||
target_link_libraries(${TARGET} PUBLIC imgui filament)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
|
||||
@@ -88,11 +88,13 @@ include_directories(${CMAKE_BINARY_DIR})
|
||||
# Filamat
|
||||
add_library(${TARGET} STATIC ${HDRS} ${PRIVATE_HDRS} ${SRCS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
target_link_libraries(${TARGET} shaders filabridge utils smol-v)
|
||||
|
||||
# Filamat Lite
|
||||
add_library(filamat_lite STATIC ${HDRS} ${LITE_PRIVATE_HDRS} ${LITE_SRCS})
|
||||
target_include_directories(filamat_lite PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(filamat_lite PROPERTIES FOLDER Libs)
|
||||
target_link_libraries(filamat_lite shaders filabridge utils)
|
||||
|
||||
# We are being naughty and accessing private headers here
|
||||
@@ -166,6 +168,8 @@ target_include_directories(${TARGET} PRIVATE src)
|
||||
|
||||
target_link_libraries(${TARGET} filamat gtest)
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tests)
|
||||
|
||||
set(TARGET test_filamat_lite)
|
||||
set(SRCS
|
||||
tests/test_filamat_lite.cpp)
|
||||
@@ -175,3 +179,5 @@ add_executable(${TARGET} ${SRCS})
|
||||
target_include_directories(${TARGET} PRIVATE src)
|
||||
|
||||
target_link_libraries(${TARGET} filamat_lite gtest)
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tests)
|
||||
|
||||
@@ -120,6 +120,7 @@ set(DUMMY_SRC "${RESOURCE_DIR}/dummy.c")
|
||||
add_custom_command(OUTPUT ${DUMMY_SRC} COMMAND echo "//" > ${DUMMY_SRC})
|
||||
|
||||
add_library(filamentapp-resources ${DUMMY_SRC} ${RESGEN_SOURCE})
|
||||
set_target_properties(filamentapp-resources PROPERTIES FOLDER Samples/Resources)
|
||||
|
||||
# ==================================================================================================
|
||||
# Include and target definitions
|
||||
@@ -132,6 +133,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_link_libraries(${TARGET} PUBLIC ${LIBS} filamentapp-resources)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
target_include_directories(${TARGET} PRIVATE ${GENERATION_ROOT})
|
||||
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -21,6 +21,7 @@ set(SRCS src/MeshReader.cpp)
|
||||
include_directories(${PUBLIC_HDR_DIR})
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
target_link_libraries(${TARGET}
|
||||
PRIVATE meshoptimizer
|
||||
PUBLIC filament # Public only because the filamesh API needs Box.h
|
||||
@@ -39,4 +40,5 @@ install(FILES ${DIST_HDRS} DESTINATION include/${TARGET})
|
||||
if (NOT IOS AND NOT WEBGL AND NOT ANDROID)
|
||||
add_executable(test_${TARGET} tests/test_filamesh.cpp )
|
||||
target_link_libraries(test_${TARGET} PRIVATE filameshio gtest)
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
@@ -27,6 +27,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_link_libraries(${TARGET} PUBLIC math utils)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
@@ -50,4 +51,5 @@ install(DIRECTORY ${PUBLIC_HDR_DIR}/geometry DESTINATION include)
|
||||
if (NOT ANDROID AND NOT WEBGL AND NOT IOS)
|
||||
add_executable(test_transcoder tests/test_transcoder.cpp)
|
||||
target_link_libraries(test_transcoder PRIVATE ${TARGET} gtest)
|
||||
set_target_properties(test_transcoder PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
@@ -123,6 +123,7 @@ build_ubershader(transmission transmission _ _)
|
||||
build_ubershader(sheen sheen _ _)
|
||||
|
||||
add_custom_target(uberz_file DEPENDS ${UBERZ_OUTPUT_PATH})
|
||||
set_target_properties(uberz_file PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Build a resgen library for the ubershader archive.
|
||||
@@ -145,6 +146,7 @@ add_custom_command(OUTPUT ${DUMMY_SRC} COMMAND echo "//" > ${DUMMY_SRC})
|
||||
|
||||
add_library(uberarchive ${DUMMY_SRC} ${RESGEN_SOURCE})
|
||||
target_include_directories(uberarchive PUBLIC ${RESOURCE_DIR})
|
||||
set_target_properties(uberarchive PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Build the "core" library (no filamat)
|
||||
@@ -156,6 +158,7 @@ link_libraries(math utils filament cgltf stb ktxreader geometry tsl trie uberzli
|
||||
add_library(gltfio_core STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
|
||||
target_include_directories(gltfio_core PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(gltfio_core PROPERTIES FOLDER Libs)
|
||||
|
||||
target_compile_definitions(gltfio_core PUBLIC -DGLTFIO_DRACO_SUPPORTED=1)
|
||||
target_link_libraries(gltfio_core PUBLIC dracodec)
|
||||
@@ -172,6 +175,7 @@ if (NOT WEBGL AND NOT ANDROID AND NOT IOS)
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} src/JitShaderProvider.cpp)
|
||||
target_link_libraries(${TARGET} PUBLIC filamat gltfio_core)
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
|
||||
@@ -35,11 +35,13 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
|
||||
add_library(${TARGET} ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
target_link_libraries(${TARGET} math utils)
|
||||
|
||||
add_library(${TARGET}-lite ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS})
|
||||
target_compile_definitions(${TARGET}-lite PUBLIC -DFILAMENT_IBL_LITE=1)
|
||||
target_include_directories(${TARGET}-lite PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET}-lite PROPERTIES FOLDER Libs)
|
||||
target_link_libraries(${TARGET}-lite math utils)
|
||||
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -88,6 +88,7 @@ add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS})
|
||||
|
||||
# specify where the public headers of this library are
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Dependencies
|
||||
|
||||
@@ -32,6 +32,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_link_libraries(${TARGET} PUBLIC math utils)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
@@ -55,4 +56,5 @@ install(DIRECTORY ${PUBLIC_HDR_DIR}/image DESTINATION include)
|
||||
if (NOT ANDROID AND NOT WEBGL AND NOT IOS AND NOT FILAMENT_SKIP_SDL2)
|
||||
add_executable(test_${TARGET} tests/test_image.cpp)
|
||||
target_link_libraries(test_${TARGET} PRIVATE image imageio gtest)
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
@@ -31,6 +31,7 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
target_link_libraries(${TARGET} PUBLIC image math png tinyexr utils z basis_encoder)
|
||||
if (WIN32)
|
||||
|
||||
@@ -27,6 +27,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_link_libraries(${TARGET} PUBLIC utils image filament basis_transcoder)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
@@ -64,4 +65,5 @@ add_testfile(lightroom_ibl.ktx)
|
||||
if (NOT ANDROID AND NOT WEBGL AND NOT IOS)
|
||||
add_executable(test_ktxreader tests/test_ktxreader.cpp ${TESTFILES})
|
||||
target_link_libraries(test_ktxreader PRIVATE ${TARGET} gtest)
|
||||
set_target_properties(test_ktxreader PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
@@ -60,6 +60,7 @@ set(DUMMY_SRC "${RESOURCE_DIR}/dummy.c")
|
||||
add_custom_command(OUTPUT ${DUMMY_SRC} COMMAND echo "//" > ${DUMMY_SRC})
|
||||
|
||||
add_library(matdbg_resources ${DUMMY_SRC} ${RESGEN_SOURCE})
|
||||
set_target_properties(matdbg_resources PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Include and target definitions
|
||||
@@ -87,6 +88,7 @@ target_link_libraries(${TARGET} PUBLIC
|
||||
target_include_directories(${TARGET} PRIVATE ${filamat_SOURCE_DIR}/src)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
|
||||
@@ -42,6 +42,7 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_compile_options(${TARGET} PRIVATE ${OPTIMIZATION_FLAGS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Installation
|
||||
@@ -59,6 +60,7 @@ add_executable(test_${TARGET}
|
||||
tests/test_quat.cpp
|
||||
)
|
||||
target_link_libraries(test_${TARGET} PRIVATE math gtest)
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
|
||||
# ==================================================================================================
|
||||
# Benchmarks
|
||||
@@ -72,3 +74,5 @@ add_executable(benchmark_${TARGET} ${BENCHMARK_SRCS})
|
||||
target_compile_options(benchmark_${TARGET} PRIVATE ${OPTIMIZATION_FLAGS})
|
||||
|
||||
target_link_libraries(benchmark_${TARGET} PRIVATE benchmark_main utils math)
|
||||
|
||||
set_target_properties(benchmark_${TARGET} PROPERTIES FOLDER Benchmarks)
|
||||
|
||||
@@ -27,6 +27,7 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_compile_options(${TARGET} PRIVATE ${OPTIMIZATION_FLAGS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
target_link_libraries(${TARGET} PRIVATE math)
|
||||
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -28,6 +28,7 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_link_libraries(${TARGET} PUBLIC math utils filabridge zstd)
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
|
||||
@@ -96,6 +96,7 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
target_link_libraries(${TARGET} PUBLIC tsl)
|
||||
|
||||
if (ANDROID)
|
||||
@@ -168,6 +169,7 @@ endif()
|
||||
add_executable(test_${TARGET} ${TEST_SRCS})
|
||||
|
||||
target_link_libraries(test_${TARGET} PRIVATE gtest utils tsl math)
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
|
||||
# ==================================================================================================
|
||||
# Benchmarks
|
||||
@@ -176,6 +178,7 @@ target_link_libraries(test_${TARGET} PRIVATE gtest utils tsl math)
|
||||
if (NOT WEBGL)
|
||||
|
||||
add_library(benchmark_${TARGET}_callee SHARED benchmark/benchmark_callee.cpp)
|
||||
set_target_properties(benchmark_${TARGET}_callee PROPERTIES FOLDER Benchmarks)
|
||||
|
||||
set(BENCHMARK_SRCS
|
||||
benchmark/benchmark_allocators.cpp
|
||||
@@ -190,4 +193,6 @@ if (NOT WEBGL)
|
||||
|
||||
target_link_libraries(benchmark_${TARGET} PRIVATE benchmark_main utils benchmark_${TARGET}_callee)
|
||||
|
||||
set_target_properties(benchmark_${TARGET} PROPERTIES FOLDER Benchmarks)
|
||||
|
||||
endif()
|
||||
|
||||
@@ -32,6 +32,7 @@ set(SRCS
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_link_libraries(${TARGET} PUBLIC imgui filament gltfio_core filagui jsmn civetweb)
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compiler flags
|
||||
@@ -55,4 +56,5 @@ install(DIRECTORY ${PUBLIC_HDR_DIR}/viewer DESTINATION include)
|
||||
if (NOT ANDROID AND NOT WEBGL AND NOT IOS)
|
||||
add_executable(test_settings tests/test_settings.cpp)
|
||||
target_link_libraries(test_settings PRIVATE ${TARGET} gtest)
|
||||
set_target_properties(test_settings PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
@@ -84,6 +84,7 @@ set(DUMMY_SRC "${RESOURCE_DIR}/dummy.c")
|
||||
add_custom_command(OUTPUT ${DUMMY_SRC} COMMAND echo "//" > ${DUMMY_SRC})
|
||||
|
||||
add_library(sample-resources ${DUMMY_SRC} ${RESGEN_SOURCE})
|
||||
set_target_properties(sample-resources PROPERTIES FOLDER Samples/Resources)
|
||||
|
||||
# ==================================================================================================
|
||||
# Invoke cmgen to build KTX files for the default IBL and skybox
|
||||
@@ -170,12 +171,14 @@ if (DEFINED RESGEN_SOURCE_FLAGS)
|
||||
endif()
|
||||
|
||||
add_library(suzanne-resources ${DUMMY_SRC} ${RESGEN_SOURCE})
|
||||
set_target_properties(suzanne-resources PROPERTIES FOLDER Samples/Resources)
|
||||
|
||||
# ==================================================================================================
|
||||
# Resources for gltf_viewer and gltf_instances
|
||||
# ==================================================================================================
|
||||
|
||||
add_library(gltf-demo-resources ${DUMMY_SRC})
|
||||
set_target_properties(gltf-demo-resources PROPERTIES FOLDER Samples/Resources)
|
||||
|
||||
set(GLTF_DEMO_RESOURCES
|
||||
${ROOT_DIR}/third_party/models/DamagedHelmet/DamagedHelmet.glb
|
||||
@@ -218,6 +221,7 @@ function(add_demo NAME)
|
||||
add_executable(${NAME} ${NAME}.cpp)
|
||||
target_link_libraries(${NAME} PRIVATE sample-resources filamentapp)
|
||||
target_compile_options(${NAME} PRIVATE ${COMPILER_FLAGS})
|
||||
set_target_properties(${NAME} PROPERTIES FOLDER Samples)
|
||||
endfunction()
|
||||
|
||||
if (NOT ANDROID)
|
||||
@@ -283,12 +287,15 @@ endif()
|
||||
file(COPY ../third_party/textures DESTINATION ${PROJECT_BINARY_DIR})
|
||||
add_custom_target(textures ALL DEPENDS textures)
|
||||
add_dependencies(filament textures)
|
||||
set_target_properties(textures PROPERTIES FOLDER Samples/Assets)
|
||||
|
||||
file(COPY ../assets DESTINATION ${PROJECT_BINARY_DIR}
|
||||
PATTERN "reference" EXCLUDE
|
||||
PATTERN "environments" EXCLUDE)
|
||||
add_custom_target(assets ALL DEPENDS assets)
|
||||
add_dependencies(filament assets)
|
||||
set_target_properties(assets PROPERTIES FOLDER Samples/Assets)
|
||||
|
||||
add_custom_target(envs DEPENDS ${target_envmaps})
|
||||
add_dependencies(filament envs)
|
||||
set_target_properties(envs PROPERTIES FOLDER Samples/Assets)
|
||||
|
||||
@@ -108,6 +108,7 @@ endif()
|
||||
# ==================================================================================================
|
||||
add_library(${TARGET} STATIC ${RESGEN_SOURCE})
|
||||
target_include_directories(${TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Filament/Shaders)
|
||||
|
||||
# ==================================================================================================
|
||||
# Installation
|
||||
|
||||
5
third_party/basisu/tnt/CMakeLists.txt
vendored
5
third_party/basisu/tnt/CMakeLists.txt
vendored
@@ -64,9 +64,14 @@ target_include_directories(basis_transcoder PUBLIC ../transcoder)
|
||||
target_compile_definitions(basis_encoder PRIVATE ${BASIS_CONFIG})
|
||||
target_compile_definitions(basis_transcoder PRIVATE ${BASIS_CONFIG})
|
||||
|
||||
set_target_properties(zstd PROPERTIES FOLDER ThirdParty)
|
||||
set_target_properties(basis_encoder PROPERTIES FOLDER ThirdParty)
|
||||
set_target_properties(basis_transcoder PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
if (IS_HOST_PLATFORM)
|
||||
add_executable(basisu ../basisu_tool.cpp)
|
||||
target_link_libraries(basisu basis_encoder)
|
||||
set_target_properties(basisu PROPERTIES FOLDER ThirdParty)
|
||||
target_compile_definitions(basisu PRIVATE ${BASIS_CONFIG})
|
||||
install(TARGETS basisu DESTINATION bin)
|
||||
|
||||
|
||||
3
third_party/benchmark/tnt/CMakeLists.txt
vendored
3
third_party/benchmark/tnt/CMakeLists.txt
vendored
@@ -40,8 +40,11 @@ endif()
|
||||
|
||||
# specify where the public headers of this library are
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
# Benchmark main library
|
||||
add_library(${TARGET}_main ${SRC_DIR}/benchmark_main.cc)
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
target_link_libraries(${TARGET}_main benchmark)
|
||||
set_target_properties(${TARGET}_main PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
1
third_party/cgltf/tnt/CMakeLists.txt
vendored
1
third_party/cgltf/tnt/CMakeLists.txt
vendored
@@ -16,3 +16,4 @@ add_compile_definitions($<$<CONFIG:Debug>:CGLTF_VALIDATE_ENABLE_ASSERTS=1>)
|
||||
add_library(${TARGET} INTERFACE)
|
||||
target_sources(${TARGET} INTERFACE ${PUBLIC_HDRS})
|
||||
target_include_directories(${TARGET} INTERFACE ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
1
third_party/civetweb/tnt/CMakeLists.txt
vendored
1
third_party/civetweb/tnt/CMakeLists.txt
vendored
@@ -28,6 +28,7 @@ add_definitions(-DUSE_WEBSOCKET)
|
||||
add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS})
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
target_link_libraries(${TARGET} ${CMAKE_DL_LIBS})
|
||||
|
||||
|
||||
32
third_party/draco/tnt/CMakeLists.txt
vendored
32
third_party/draco/tnt/CMakeLists.txt
vendored
@@ -559,6 +559,7 @@ set(draco_cmake_helper_scripts "${draco_root}/cmake/FindDraco.cmake"
|
||||
# targets. Silence the harmless warnings/errors with some dummy source files.
|
||||
foreach(target ${draco_header_only_targets})
|
||||
add_dummy_source_file_to_target("${target}" "cc")
|
||||
set_target_properties(${target} PROPERTIES FOLDER ThirdParty/draco)
|
||||
endforeach()
|
||||
|
||||
# Generate $draco_build_dir/draco/draco_features.h.
|
||||
@@ -569,3 +570,34 @@ target_include_directories(dracodec
|
||||
PUBLIC "${draco_root}/src")
|
||||
|
||||
install(TARGETS dracodec ARCHIVE DESTINATION lib/${DIST_DIR})
|
||||
|
||||
# Add Draco Targets to the ThirdParty/draco folder
|
||||
set_target_properties(draco_attributes PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_attributes_dec PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_attributes_enc PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_attributes_pred_schemes_dec PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_attributes_pred_schemes_enc PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_bit_coders PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_enc_config PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_dec_config PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_decode PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_encode PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_entropy PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_mesh_traverser PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_mesh_dec PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_mesh_enc PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_point_cloud_dec PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_compression_point_cloud_enc PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_core PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_io PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_mesh PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_metadata_dec PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_metadata_enc PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_metadata PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_animation_dec PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_animation_enc PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_animation PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_point_cloud PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_points_dec PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(draco_points_enc PROPERTIES FOLDER ThirdParty/draco)
|
||||
set_target_properties(dracodec PROPERTIES FOLDER ThirdParty/draco)
|
||||
|
||||
1
third_party/getopt/CMakeLists.txt
vendored
1
third_party/getopt/CMakeLists.txt
vendored
@@ -21,3 +21,4 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
|
||||
add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS})
|
||||
target_include_directories (${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
@@ -1,7 +1,7 @@
|
||||
set(SOURCES ../InitializeDll.cpp ../InitializeDll.h)
|
||||
|
||||
add_library(OGLCompiler STATIC ${SOURCES})
|
||||
set_property(TARGET OGLCompiler PROPERTY FOLDER glslang)
|
||||
set_property(TARGET OGLCompiler PROPERTY FOLDER ThirdParty/glslang)
|
||||
set_property(TARGET OGLCompiler PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
if(WIN32)
|
||||
|
||||
2
third_party/glslang/SPIRV/tnt/CMakeLists.txt
vendored
2
third_party/glslang/SPIRV/tnt/CMakeLists.txt
vendored
@@ -38,7 +38,7 @@ endif(ENABLE_NV_EXTENSIONS)
|
||||
add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
|
||||
target_include_directories(SPIRV PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
target_include_directories(SPIRV PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../..)
|
||||
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPIRV PROPERTY FOLDER ThirdParty/glslang)
|
||||
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
glslang_add_build_info_dependency(SPIRV)
|
||||
|
||||
@@ -81,7 +81,7 @@ set(HEADERS
|
||||
# set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp)
|
||||
|
||||
add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
|
||||
set_property(TARGET glslang PROPERTY FOLDER glslang)
|
||||
set_property(TARGET glslang PROPERTY FOLDER ThirdParty/glslang)
|
||||
set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
glslang_add_build_info_dependency(glslang)
|
||||
|
||||
2
third_party/imgui/tnt/CMakeLists.txt
vendored
2
third_party/imgui/tnt/CMakeLists.txt
vendored
@@ -32,3 +32,5 @@ set(SRCS
|
||||
add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS})
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR} ${PRIVATE_HDR_DIR})
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
1
third_party/jsmn/tnt/CMakeLists.txt
vendored
1
third_party/jsmn/tnt/CMakeLists.txt
vendored
@@ -12,3 +12,4 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
add_library(${TARGET} INTERFACE)
|
||||
target_sources(${TARGET} INTERFACE ${PUBLIC_HDRS})
|
||||
target_include_directories(${TARGET} INTERFACE ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
2
third_party/libassimp/tnt/CMakeLists.txt
vendored
2
third_party/libassimp/tnt/CMakeLists.txt
vendored
@@ -297,3 +297,5 @@ target_include_directories (${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
|
||||
# and we're linking against the libraries below, importing their public headers
|
||||
target_link_libraries(${TARGET} LINK_PUBLIC z)
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
1
third_party/libgtest/tnt/CMakeLists.txt
vendored
1
third_party/libgtest/tnt/CMakeLists.txt
vendored
@@ -35,3 +35,4 @@ endif()
|
||||
|
||||
# specify where the public headers of this library are
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
1
third_party/libpng/tnt/CMakeLists.txt
vendored
1
third_party/libpng/tnt/CMakeLists.txt
vendored
@@ -56,3 +56,4 @@ target_link_libraries(${TARGET} PUBLIC z)
|
||||
|
||||
# specify where the public headers of this library are
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
5
third_party/libsdl2/tnt/CMakeLists.txt
vendored
5
third_party/libsdl2/tnt/CMakeLists.txt
vendored
@@ -197,6 +197,7 @@ add_library(${TARGET} STATIC ${SRCS})
|
||||
|
||||
# libraries we're linking against
|
||||
target_link_libraries(${TARGET} ${EXTRA_LIBS})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
if(NOT MSVC)
|
||||
target_compile_options(${TARGET}
|
||||
@@ -220,6 +221,9 @@ if (WIN32)
|
||||
target_compile_options(${TARGET} PRIVATE -Wno-unused-local-typedef)
|
||||
target_compile_options(${TARGET}main PRIVATE -Wno-pragma-pack)
|
||||
endif()
|
||||
|
||||
# Set sdl2main's folder here
|
||||
set_target_properties(sdl2main PROPERTIES FOLDER ThirdParty)
|
||||
else()
|
||||
target_compile_options(${TARGET} PRIVATE -fvisibility=hidden)
|
||||
|
||||
@@ -227,4 +231,3 @@ else()
|
||||
# implementation for aarch64 on certain targets. ideally, we would just std::atomic
|
||||
target_compile_definitions(${TARGET} PRIVATE SDL_ATOMIC_DISABLED=1)
|
||||
endif()
|
||||
|
||||
|
||||
1
third_party/libz/tnt/CMakeLists.txt
vendored
1
third_party/libz/tnt/CMakeLists.txt
vendored
@@ -58,3 +58,4 @@ add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS})
|
||||
|
||||
# specify where the public headers of this library are
|
||||
target_include_directories (${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
1
third_party/meshoptimizer/CMakeLists.txt
vendored
1
third_party/meshoptimizer/CMakeLists.txt
vendored
@@ -21,6 +21,7 @@ set(SOURCES
|
||||
|
||||
add_library(meshoptimizer STATIC ${SOURCES})
|
||||
target_include_directories(meshoptimizer INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/src")
|
||||
set_target_properties(meshoptimizer PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
if(MSVC)
|
||||
target_compile_options(meshoptimizer PRIVATE /W4 /WX)
|
||||
|
||||
1
third_party/robin-map/tnt/CMakeLists.txt
vendored
1
third_party/robin-map/tnt/CMakeLists.txt
vendored
@@ -22,6 +22,7 @@ include_directories(${OUR_DIR}/tsl)
|
||||
add_library(${TARGET} INTERFACE)
|
||||
target_sources(${TARGET} INTERFACE ${PUBLIC_HDRS})
|
||||
target_include_directories(${TARGET} INTERFACE ${OUR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
# ==================================================================================================
|
||||
# Installation
|
||||
|
||||
1
third_party/smol-v/tnt/CMakeLists.txt
vendored
1
third_party/smol-v/tnt/CMakeLists.txt
vendored
@@ -21,5 +21,6 @@ if (NOT MSVC)
|
||||
endif()
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR})
|
||||
|
||||
4
third_party/spirv-cross/tnt/CMakeLists.txt
vendored
4
third_party/spirv-cross/tnt/CMakeLists.txt
vendored
@@ -92,3 +92,7 @@ spirv_cross_add_library(spirv-cross-msl spirv_cross_msl STATIC
|
||||
../spirv_msl.hpp)
|
||||
|
||||
target_link_libraries(spirv-cross-glsl spirv-cross-msl spirv-cross-core)
|
||||
|
||||
set_target_properties(spirv-cross-glsl PROPERTIES FOLDER ThirdParty)
|
||||
set_target_properties(spirv-cross-msl PROPERTIES FOLDER ThirdParty)
|
||||
set_target_properties(spirv-cross-core PROPERTIES FOLDER ThirdParty)
|
||||
17
third_party/spirv-tools/source/CMakeLists.txt
vendored
17
third_party/spirv-tools/source/CMakeLists.txt
vendored
@@ -124,7 +124,7 @@ macro(spvtools_vendor_tables VENDOR_TABLE SHORT_NAME OPERAND_KIND_PREFIX)
|
||||
DEPENDS ${GRAMMAR_PROCESSING_SCRIPT} ${GRAMMAR_FILE}
|
||||
COMMENT "Generate extended instruction tables for ${VENDOR_TABLE}.")
|
||||
add_custom_target(spv-tools-${SHORT_NAME} DEPENDS ${INSTS_FILE})
|
||||
set_property(TARGET spv-tools-${SHORT_NAME} PROPERTY FOLDER "SPIRV-Tools build")
|
||||
set_property(TARGET spv-tools-${SHORT_NAME} PROPERTY FOLDER "ThirdParty/SPIRV-Tools build")
|
||||
list(APPEND EXTINST_CPP_DEPENDS spv-tools-${SHORT_NAME})
|
||||
endmacro(spvtools_vendor_tables)
|
||||
|
||||
@@ -137,7 +137,7 @@ macro(spvtools_extinst_lang_headers NAME GRAMMAR_FILE)
|
||||
DEPENDS ${LANG_HEADER_PROCESSING_SCRIPT} ${GRAMMAR_FILE}
|
||||
COMMENT "Generate language specific header for ${NAME}.")
|
||||
add_custom_target(spirv-tools-header-${NAME} DEPENDS ${OUT_H})
|
||||
set_property(TARGET spirv-tools-header-${NAME} PROPERTY FOLDER "SPIRV-Tools build")
|
||||
set_property(TARGET spirv-tools-header-${NAME} PROPERTY FOLDER "ThirdParty/SPIRV-Tools build")
|
||||
list(APPEND EXTINST_CPP_DEPENDS spirv-tools-header-${NAME})
|
||||
endmacro(spvtools_extinst_lang_headers)
|
||||
|
||||
@@ -159,7 +159,7 @@ spvtools_extinst_lang_headers("NonSemanticShaderDebugInfo100" ${VKDEBUGINFO100_G
|
||||
|
||||
spvtools_vimsyntax("unified1" "1.0")
|
||||
add_custom_target(spirv-tools-vimsyntax DEPENDS ${VIMSYNTAX_FILE})
|
||||
set_property(TARGET spirv-tools-vimsyntax PROPERTY FOLDER "SPIRV-Tools utilities")
|
||||
set_property(TARGET spirv-tools-vimsyntax PROPERTY FOLDER "ThirdParty/SPIRV-Tools utilities")
|
||||
|
||||
# Extract the list of known generators from the SPIR-V XML registry file.
|
||||
set(GENERATOR_INC_FILE ${spirv-tools_BINARY_DIR}/generators.inc)
|
||||
@@ -184,6 +184,13 @@ add_custom_target(enum_string_mapping
|
||||
add_custom_target(extinst_tables
|
||||
DEPENDS ${EXTINST_CPP_DEPENDS})
|
||||
|
||||
set_target_properties(core_tables PROPERTIES
|
||||
FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
set_target_properties(enum_string_mapping PROPERTIES
|
||||
FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
set_target_properties(extinst_tables PROPERTIES
|
||||
FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
|
||||
set_source_files_properties(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/extensions.h
|
||||
PROPERTIES HEADER_FILE_ONLY TRUE)
|
||||
@@ -205,7 +212,7 @@ add_custom_command(OUTPUT ${SPIRV_TOOLS_BUILD_VERSION_INC}
|
||||
# This is not required for any dependence chain.
|
||||
add_custom_target(spirv-tools-build-version
|
||||
DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC})
|
||||
set_property(TARGET spirv-tools-build-version PROPERTY FOLDER "SPIRV-Tools build")
|
||||
set_property(TARGET spirv-tools-build-version PROPERTY FOLDER "ThirdParty/SPIRV-Tools build")
|
||||
|
||||
list(APPEND PCH_DEPENDS ${ENUM_STRING_MAPPING_CPP_DEPENDS} ${OPCODE_CPP_DEPENDS} ${OPERAND_CPP_DEPENDS} ${EXTENSION_H_DEPENDS} ${EXTINST_CPP_DEPENDS} ${SPIRV_TOOLS_BUILD_VERSION_INC})
|
||||
set_source_files_properties(
|
||||
@@ -367,7 +374,7 @@ function(spirv_tools_default_target_options target)
|
||||
PRIVATE ${spirv-tools_BINARY_DIR}
|
||||
PRIVATE ${SPIRV_HEADER_INCLUDE_DIR}
|
||||
)
|
||||
set_property(TARGET ${target} PROPERTY FOLDER "SPIRV-Tools libraries")
|
||||
set_property(TARGET ${target} PROPERTY FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
spvtools_check_symbol_exports(${target})
|
||||
add_dependencies(${target} spirv-tools-build-version core_tables enum_string_mapping extinst_tables)
|
||||
endfunction()
|
||||
|
||||
@@ -35,7 +35,7 @@ target_link_libraries(SPIRV-Tools-diff
|
||||
target_link_libraries(SPIRV-Tools-diff
|
||||
PUBLIC SPIRV-Tools-opt)
|
||||
|
||||
set_property(TARGET SPIRV-Tools-diff PROPERTY FOLDER "SPIRV-Tools libraries")
|
||||
set_property(TARGET SPIRV-Tools-diff PROPERTY FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
spvtools_check_symbol_exports(SPIRV-Tools-diff)
|
||||
|
||||
if(ENABLE_SPIRV_TOOLS_INSTALL)
|
||||
|
||||
@@ -466,7 +466,7 @@ if(SPIRV_BUILD_FUZZER)
|
||||
PUBLIC SPIRV-Tools-reduce
|
||||
PUBLIC protobuf::libprotobuf)
|
||||
|
||||
set_property(TARGET SPIRV-Tools-fuzz PROPERTY FOLDER "SPIRV-Tools libraries")
|
||||
set_property(TARGET SPIRV-Tools-fuzz PROPERTY FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
spvtools_check_symbol_exports(SPIRV-Tools-fuzz)
|
||||
|
||||
if(ENABLE_SPIRV_TOOLS_INSTALL)
|
||||
|
||||
@@ -27,7 +27,7 @@ target_include_directories(SPIRV-Tools-link
|
||||
target_link_libraries(SPIRV-Tools-link
|
||||
PUBLIC SPIRV-Tools-opt)
|
||||
|
||||
set_property(TARGET SPIRV-Tools-link PROPERTY FOLDER "SPIRV-Tools libraries")
|
||||
set_property(TARGET SPIRV-Tools-link PROPERTY FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
spvtools_check_symbol_exports(SPIRV-Tools-link)
|
||||
|
||||
if(ENABLE_SPIRV_TOOLS_INSTALL)
|
||||
|
||||
@@ -42,7 +42,7 @@ target_link_libraries(SPIRV-Tools-lint
|
||||
target_link_libraries(SPIRV-Tools-lint
|
||||
PUBLIC SPIRV-Tools-opt)
|
||||
|
||||
set_property(TARGET SPIRV-Tools-lint PROPERTY FOLDER "SPIRV-Tools libraries")
|
||||
set_property(TARGET SPIRV-Tools-lint PROPERTY FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
spvtools_check_symbol_exports(SPIRV-Tools-lint)
|
||||
|
||||
if(ENABLE_SPIRV_TOOLS_INSTALL)
|
||||
|
||||
@@ -261,7 +261,7 @@ target_include_directories(SPIRV-Tools-opt
|
||||
target_link_libraries(SPIRV-Tools-opt
|
||||
PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY})
|
||||
|
||||
set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "SPIRV-Tools libraries")
|
||||
set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
spvtools_check_symbol_exports(SPIRV-Tools-opt)
|
||||
|
||||
if(ENABLE_SPIRV_TOOLS_INSTALL)
|
||||
|
||||
@@ -97,7 +97,7 @@ target_link_libraries(SPIRV-Tools-reduce
|
||||
PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}
|
||||
PUBLIC SPIRV-Tools-opt)
|
||||
|
||||
set_property(TARGET SPIRV-Tools-reduce PROPERTY FOLDER "SPIRV-Tools libraries")
|
||||
set_property(TARGET SPIRV-Tools-reduce PROPERTY FOLDER "ThirdParty/SPIRV-Tools libraries")
|
||||
spvtools_check_symbol_exports(SPIRV-Tools-reduce)
|
||||
|
||||
if(ENABLE_SPIRV_TOOLS_INSTALL)
|
||||
|
||||
2
third_party/spirv-tools/tools/CMakeLists.txt
vendored
2
third_party/spirv-tools/tools/CMakeLists.txt
vendored
@@ -36,7 +36,7 @@ function(add_spvtools_tool)
|
||||
${spirv-tools_SOURCE_DIR}
|
||||
${spirv-tools_BINARY_DIR}
|
||||
)
|
||||
set_property(TARGET ${ARG_TARGET} PROPERTY FOLDER "SPIRV-Tools executables")
|
||||
set_property(TARGET ${ARG_TARGET} PROPERTY FOLDER "ThirdParty/SPIRV-Tools executables")
|
||||
endfunction()
|
||||
|
||||
if (NOT ${SPIRV_SKIP_EXECUTABLES})
|
||||
|
||||
1
third_party/stb/tnt/CMakeLists.txt
vendored
1
third_party/stb/tnt/CMakeLists.txt
vendored
@@ -12,5 +12,6 @@ set(SRCS ../stb_image.cpp)
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
|
||||
install(TARGETS stb ARCHIVE DESTINATION lib/${DIST_DIR})
|
||||
|
||||
1
third_party/tinyexr/tnt/CMakeLists.txt
vendored
1
third_party/tinyexr/tnt/CMakeLists.txt
vendored
@@ -20,3 +20,4 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
|
||||
target_include_directories (${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
target_link_libraries(${TARGET} LINK_PUBLIC z)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
1
third_party/vkmemalloc/tnt/CMakeLists.txt
vendored
1
third_party/vkmemalloc/tnt/CMakeLists.txt
vendored
@@ -12,3 +12,4 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
add_library(${TARGET} INTERFACE)
|
||||
target_sources(${TARGET} INTERFACE ${PUBLIC_HDRS})
|
||||
target_include_directories(${TARGET} INTERFACE ${PUBLIC_HDR_DIR})
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
|
||||
@@ -23,6 +23,7 @@ set(SRCS
|
||||
add_executable(${TARGET} ${HDRS} ${SRCS})
|
||||
|
||||
target_link_libraries(${TARGET} PRIVATE math utils ibl z image imageio getopt)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compile options and optimizations
|
||||
@@ -56,4 +57,5 @@ install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
|
||||
if (NOT ANDROID)
|
||||
add_executable(test_${TARGET} tests/test_cmgen.cpp)
|
||||
target_link_libraries(test_${TARGET} PRIVATE image imageio gtest)
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
@@ -16,6 +16,7 @@ set(SRCS src/main.cpp)
|
||||
add_executable(${TARGET} ${HDRS} ${SRCS})
|
||||
|
||||
target_link_libraries(${TARGET} PRIVATE math utils z image imageio getopt)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compile options and optimizations
|
||||
|
||||
@@ -20,6 +20,7 @@ target_link_libraries(${TARGET} PUBLIC math)
|
||||
target_link_libraries(${TARGET} PUBLIC utils)
|
||||
target_link_libraries(${TARGET} PUBLIC assimp)
|
||||
target_link_libraries(${TARGET} PRIVATE getopt filameshio meshoptimizer)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compile options and optimizations
|
||||
|
||||
@@ -13,6 +13,7 @@ set(SRCS src/main.cpp src/GlslMinify.cpp)
|
||||
# ==================================================================================================
|
||||
add_executable(${TARGET} ${SRCS})
|
||||
target_link_libraries(${TARGET} PRIVATE utils getopt)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# =================================================================================================
|
||||
# Licenses
|
||||
@@ -37,4 +38,5 @@ if (NOT ANDROID)
|
||||
)
|
||||
target_include_directories(test_${TARGET} PRIVATE src)
|
||||
target_link_libraries(test_${TARGET} PRIVATE gtest)
|
||||
set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests)
|
||||
endif()
|
||||
|
||||
@@ -45,6 +45,7 @@ target_include_directories(${TARGET} PUBLIC src)
|
||||
target_include_directories(${TARGET} PRIVATE ${filamat_SOURCE_DIR}/src)
|
||||
|
||||
target_link_libraries(${TARGET} getopt filamat filabridge utils)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# =================================================================================================
|
||||
# Licenses
|
||||
@@ -70,6 +71,7 @@ set(SRCS src/main.cpp)
|
||||
# ==================================================================================================
|
||||
add_executable(${TARGET} ${SRCS} ${HDRS})
|
||||
target_link_libraries(${TARGET} matlang)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# ==================================================================================================
|
||||
# Installation
|
||||
@@ -90,3 +92,5 @@ set(SRCS
|
||||
add_executable(${TARGET} ${SRCS})
|
||||
|
||||
target_link_libraries(${TARGET} matlang gtest)
|
||||
|
||||
set_target_properties(test_matc PROPERTIES FOLDER Tests)
|
||||
|
||||
@@ -20,6 +20,8 @@ target_link_libraries(${TARGET} matdbg filaflat backend_headers utils getopt SPI
|
||||
# in the path allows us to do #include <SPIRV/disassemble.h>
|
||||
target_include_directories(${TARGET} PRIVATE ${../glslang_SOURCE_DIR}/..)
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# =================================================================================================
|
||||
# Licenses
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -13,6 +13,7 @@ set(SRCS src/main.cpp)
|
||||
# ==================================================================================================
|
||||
add_executable(${TARGET} ${SRCS})
|
||||
target_link_libraries(${TARGET} PRIVATE math utils z image imageio getopt)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# =================================================================================================
|
||||
# Licenses
|
||||
|
||||
@@ -17,6 +17,8 @@ add_executable(${TARGET} ${HDRS} ${SRCS})
|
||||
|
||||
target_link_libraries(${TARGET} PRIVATE math utils z image imageio getopt)
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compile options and optimizations
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -13,6 +13,7 @@ set(SRCS src/main.cpp)
|
||||
# ==================================================================================================
|
||||
add_executable(${TARGET} ${SRCS})
|
||||
target_link_libraries(${TARGET} PRIVATE utils getopt)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# =================================================================================================
|
||||
# Licenses
|
||||
|
||||
@@ -15,6 +15,8 @@ add_executable(${TARGET} ${SRCS})
|
||||
|
||||
target_link_libraries(${TARGET} getopt utils math)
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# =================================================================================================
|
||||
# Licenses
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -17,6 +17,8 @@ add_executable(${TARGET} ${HDRS} ${SRCS})
|
||||
|
||||
target_link_libraries(${TARGET} PRIVATE math utils z image imageio getopt)
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# ==================================================================================================
|
||||
# Compile options and optimizations
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -15,6 +15,8 @@ add_executable(${TARGET} ${SRCS})
|
||||
|
||||
target_link_libraries(${TARGET} getopt utils math)
|
||||
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# =================================================================================================
|
||||
# Licenses
|
||||
# ==================================================================================================
|
||||
|
||||
@@ -14,6 +14,7 @@ set(SRCS
|
||||
# ==================================================================================================
|
||||
add_executable(${TARGET} ${SRCS})
|
||||
target_link_libraries(${TARGET} PRIVATE utils getopt uberzlib)
|
||||
set_target_properties(${TARGET} PROPERTIES FOLDER Tools)
|
||||
|
||||
# =================================================================================================
|
||||
# Licenses
|
||||
|
||||
Reference in New Issue
Block a user