Skip to content

Commit

Permalink
Drop EXLUCDE_FROM_ALL. Breaks shared install on CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
Themaister committed Oct 21, 2023
1 parent 6b90d5c commit 6dd57f1
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 19 deletions.
34 changes: 17 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,33 +209,33 @@ function(add_granite_internal_static_lib NAME)
target_compile_options(${NAME} PRIVATE ${GRANITE_CXX_FLAGS})
endfunction()

add_subdirectory(third_party EXCLUDE_FROM_ALL)
add_subdirectory(util EXCLUDE_FROM_ALL)
add_subdirectory(path EXCLUDE_FROM_ALL)
add_subdirectory(math EXCLUDE_FROM_ALL)
add_subdirectory(threading EXCLUDE_FROM_ALL)
add_subdirectory(compiler EXCLUDE_FROM_ALL)
add_subdirectory(filesystem EXCLUDE_FROM_ALL)
add_subdirectory(vulkan EXCLUDE_FROM_ALL)
add_subdirectory(ecs EXCLUDE_FROM_ALL)
add_subdirectory(event EXCLUDE_FROM_ALL)
add_subdirectory(third_party)
add_subdirectory(util)
add_subdirectory(path)
add_subdirectory(math)
add_subdirectory(threading)
add_subdirectory(compiler)
add_subdirectory(filesystem)
add_subdirectory(vulkan)
add_subdirectory(ecs)
add_subdirectory(event)
if (GRANITE_VULKAN_SYSTEM_HANDLES AND GRANITE_RENDERER)
add_subdirectory(renderer EXCLUDE_FROM_ALL)
add_subdirectory(ui EXCLUDE_FROM_ALL)
add_subdirectory(scene-export EXCLUDE_FROM_ALL)
add_subdirectory(renderer)
add_subdirectory(ui)
add_subdirectory(scene-export)
endif()

if (GRANITE_FFMPEG)
add_subdirectory(video EXCLUDE_FROM_ALL)
add_subdirectory(video)
endif()

add_subdirectory(application EXCLUDE_FROM_ALL)
add_subdirectory(application)

if (GRANITE_AUDIO)
add_subdirectory(audio EXCLUDE_FROM_ALL)
add_subdirectory(audio)
endif()
if (GRANITE_BULLET)
add_subdirectory(physics EXCLUDE_FROM_ALL)
add_subdirectory(physics)
endif()

add_library(granite-base INTERFACE)
Expand Down
6 changes: 4 additions & 2 deletions third_party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,7 @@ if (ANDROID AND GRANITE_AUDIO)
target_compile_features(oboe PRIVATE cxx_std_17)
endif()

# Custom integration, bypass all the noise.
add_subdirectory(fsr2/src/ffx-fsr2-api/granite)
if (GRANITE_VULKAN_SYSTEM_HANDLES AND GRANITE_RENDERER)
# Custom integration, bypass all the noise.
add_subdirectory(fsr2/src/ffx-fsr2-api/granite)
endif()

0 comments on commit 6dd57f1

Please sign in to comment.