summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2024-10-29 10:15:21 +0800
committerGitHub <noreply@github.com>2024-10-29 10:15:21 +0800
commit657287e774c6d7f740bedbcbd9846de473dd1b18 (patch)
tree0466c5182a4331df4442551dc5305aece34b1e85 /source
parentd38fbaefe4e4e43f9febc1afb985227a221963ea (diff)
format cmake files (#5406)
* format cmake files * format code --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'source')
-rw-r--r--source/core/CMakeLists.txt7
-rw-r--r--source/slang-core-module/CMakeLists.txt65
-rw-r--r--source/slang-glslang/CMakeLists.txt6
-rw-r--r--source/slang-rt/CMakeLists.txt3
-rw-r--r--source/slang-wasm/CMakeLists.txt2
-rw-r--r--source/slang/CMakeLists.txt83
6 files changed, 98 insertions, 68 deletions
diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt
index 15da2abfb..8228d0067 100644
--- a/source/core/CMakeLists.txt
+++ b/source/core/CMakeLists.txt
@@ -3,8 +3,9 @@ slang_add_target(
STATIC
EXCLUDE_FROM_ALL
USE_EXTRA_WARNINGS
- LINK_WITH_PRIVATE
- miniz lz4_static Threads::Threads ${CMAKE_DL_LIBS}
+ LINK_WITH_PRIVATE miniz lz4_static Threads::Threads ${CMAKE_DL_LIBS}
LINK_WITH_PUBLIC unordered_dense::unordered_dense
- INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/source ${slang_SOURCE_DIR}/include
+ INCLUDE_DIRECTORIES_PUBLIC
+ ${slang_SOURCE_DIR}/source
+ ${slang_SOURCE_DIR}/include
)
diff --git a/source/slang-core-module/CMakeLists.txt b/source/slang-core-module/CMakeLists.txt
index fd9394e4a..96a874d08 100644
--- a/source/slang-core-module/CMakeLists.txt
+++ b/source/slang-core-module/CMakeLists.txt
@@ -29,18 +29,23 @@ set(core_module_common_args
.
OBJECT
EXCLUDE_FROM_ALL
- EXPORT_MACRO_PREFIX SLANG
- EXPORT_TYPE_AS ${SLANG_LIB_TYPE}
- FOLDER generated
- LINK_WITH_PRIVATE core
+ EXPORT_MACRO_PREFIX
+ SLANG
+ EXPORT_TYPE_AS
+ ${SLANG_LIB_TYPE}
+ FOLDER
+ generated
+ LINK_WITH_PRIVATE
+ core
USE_EXTRA_WARNINGS
- EXPLICIT_SOURCE ./slang-embedded-core-module.cpp
+ EXPLICIT_SOURCE
+ ./slang-embedded-core-module.cpp
)
slang_add_target(
${core_module_common_args}
TARGET_NAME slang-embedded-core-module
- EXPLICIT_SOURCE ${core_module_generated_header}
+ EXPLICIT_SOURCE ${core_module_generated_header}
EXTRA_COMPILE_DEFINITIONS_PRIVATE SLANG_EMBED_CORE_MODULE
INCLUDE_DIRECTORIES_PRIVATE ${core_module_generated_header_dir}
)
@@ -56,7 +61,10 @@ slang_add_target(
# List of *.meta.slang headers
set(core_module_meta_source_dir "${slang_SOURCE_DIR}/source/slang")
-glob_append(core_module_meta_source "${core_module_meta_source_dir}/*.meta.slang")
+glob_append(
+ core_module_meta_source
+ "${core_module_meta_source_dir}/*.meta.slang"
+)
set(core_module_meta_output_dir "${CMAKE_CURRENT_BINARY_DIR}/core-module-meta")
@@ -87,7 +95,10 @@ add_custom_command(
VERBATIM
)
-add_custom_target(generate-core-module-headers DEPENDS ${core_module_meta_generated_headers})
+add_custom_target(
+ generate-core-module-headers
+ DEPENDS ${core_module_meta_generated_headers}
+)
set_target_properties(generate-core-module-headers PROPERTIES FOLDER generated)
#
@@ -99,22 +110,28 @@ set(core_module_source_common_args
OBJECT
EXCLUDE_FROM_ALL
USE_EXTRA_WARNINGS
- LINK_WITH_PRIVATE
- core
- slang-capability-defs
- slang-reflect-headers
- SPIRV-Headers
- INCLUDE_DIRECTORIES_PRIVATE ../slang
- FOLDER generated
- EXPLICIT_SOURCE
- ./slang-embedded-core-module-source.cpp
- ${core_module_meta_generated_headers}
- REQUIRES generate-core-module-headers
- EXTRA_COMPILE_DEFINITIONS_PRIVATE SLANG_EMBED_CORE_MODULE_SOURCE
- INCLUDE_DIRECTORIES_PRIVATE
- ${core_module_meta_output_dir}
- EXPORT_MACRO_PREFIX SLANG
- EXPORT_TYPE_AS ${SLANG_LIB_TYPE}
+ LINK_WITH_PRIVATE
+ core
+ slang-capability-defs
+ slang-reflect-headers
+ SPIRV-Headers
+ INCLUDE_DIRECTORIES_PRIVATE
+ ../slang
+ FOLDER
+ generated
+ EXPLICIT_SOURCE
+ ./slang-embedded-core-module-source.cpp
+ ${core_module_meta_generated_headers}
+ REQUIRES
+ generate-core-module-headers
+ EXTRA_COMPILE_DEFINITIONS_PRIVATE
+ SLANG_EMBED_CORE_MODULE_SOURCE
+ INCLUDE_DIRECTORIES_PRIVATE
+ ${core_module_meta_output_dir}
+ EXPORT_MACRO_PREFIX
+ SLANG
+ EXPORT_TYPE_AS
+ ${SLANG_LIB_TYPE}
)
slang_add_target(
diff --git a/source/slang-glslang/CMakeLists.txt b/source/slang-glslang/CMakeLists.txt
index 37bb93ca0..d28177ccc 100644
--- a/source/slang-glslang/CMakeLists.txt
+++ b/source/slang-glslang/CMakeLists.txt
@@ -12,5 +12,9 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
)
# Our only interface is through what we define in source/slang-glslang, in the
# interests of hygiene, hide anything else we link in.
- add_supported_cxx_linker_flags(slang-glslang PRIVATE "-Wl,--exclude-libs,ALL")
+ add_supported_cxx_linker_flags(
+ slang-glslang
+ PRIVATE
+ "-Wl,--exclude-libs,ALL"
+ )
endif()
diff --git a/source/slang-rt/CMakeLists.txt b/source/slang-rt/CMakeLists.txt
index fc37237cd..2dc56355e 100644
--- a/source/slang-rt/CMakeLists.txt
+++ b/source/slang-rt/CMakeLists.txt
@@ -5,8 +5,7 @@ if(SLANG_ENABLE_SLANGRT)
# This compiles 'core' again with the SLANG_RT_DYNAMIC_EXPORT macro defined
EXTRA_SOURCE_DIRS ${slang_SOURCE_DIR}/source/core
USE_EXTRA_WARNINGS
- LINK_WITH_PRIVATE
- miniz lz4_static Threads::Threads ${CMAKE_DL_LIBS}
+ LINK_WITH_PRIVATE miniz lz4_static Threads::Threads ${CMAKE_DL_LIBS}
LINK_WITH_PUBLIC unordered_dense::unordered_dense
EXPORT_MACRO_PREFIX SLANG_RT
INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/include
diff --git a/source/slang-wasm/CMakeLists.txt b/source/slang-wasm/CMakeLists.txt
index 75bbe3b69..2f3e6e8d3 100644
--- a/source/slang-wasm/CMakeLists.txt
+++ b/source/slang-wasm/CMakeLists.txt
@@ -3,7 +3,7 @@
#
# This is an executable target because emcmake produces .a files without bindings if you just create a static library
# https://stackoverflow.com/questions/63622009/static-library-built-with-cmake-as-a-with-emscripten-instead-of-wasm-js
-if (EMSCRIPTEN)
+if(EMSCRIPTEN)
slang_add_target(
.
EXECUTABLE
diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt
index a08ad1efc..fc815f84c 100644
--- a/source/slang/CMakeLists.txt
+++ b/source/slang/CMakeLists.txt
@@ -1,4 +1,3 @@
-
#
# generate capability files
#
@@ -20,7 +19,8 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E make_directory ${SLANG_CAPABILITY_OUTPUT_DIR}
COMMAND
slang-capability-generator ${SLANG_CAPABILITY_SOURCE} --target-directory
- ${SLANG_CAPABILITY_OUTPUT_DIR} --doc "${slang_SOURCE_DIR}/docs/user-guide/a3-02-reference-capability-atoms.md"
+ ${SLANG_CAPABILITY_OUTPUT_DIR} --doc
+ "${slang_SOURCE_DIR}/docs/user-guide/a3-02-reference-capability-atoms.md"
DEPENDS ${SLANG_CAPABILITY_SOURCE} slang-capability-generator
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
VERBATIM
@@ -105,8 +105,10 @@ target_include_directories(
# generated lookup tables
#
-if (NOT SLANG_USE_SYSTEM_SPIRV_HEADERS)
- set(SLANG_SPIRV_HEADERS_INCLUDE_DIR "${slang_SOURCE_DIR}/external/spirv-headers/include")
+if(NOT SLANG_USE_SYSTEM_SPIRV_HEADERS)
+ set(SLANG_SPIRV_HEADERS_INCLUDE_DIR
+ "${slang_SOURCE_DIR}/external/spirv-headers/include"
+ )
endif()
set(SLANG_LOOKUP_GENERATOR_INPUT_JSON
@@ -146,8 +148,7 @@ add_custom_command(
COMMAND
${CMAKE_COMMAND} -E make_directory ${SLANG_LOOKUP_GENERATOR_OUTPUT_DIR}
COMMAND
- slang-spirv-embed-generator
- ${SLANG_SPIRV_CORE_SOURCE_JSON}
+ slang-spirv-embed-generator ${SLANG_SPIRV_CORE_SOURCE_JSON}
${SLANG_SPIRV_CORE_GRAMMAR_SOURCE}
DEPENDS ${SLANG_SPIRV_CORE_SOURCE_JSON} slang-spirv-embed-generator
VERBATIM
@@ -157,7 +158,9 @@ slang_add_target(
slang-lookup-tables
OBJECT
USE_EXTRA_WARNINGS
- EXPLICIT_SOURCE ${SLANG_LOOKUP_GENERATED_SOURCE} ${SLANG_SPIRV_CORE_GRAMMAR_SOURCE}
+ EXPLICIT_SOURCE
+ ${SLANG_LOOKUP_GENERATED_SOURCE}
+ ${SLANG_SPIRV_CORE_GRAMMAR_SOURCE}
LINK_WITH_PRIVATE core SPIRV-Headers
EXCLUDE_FROM_ALL
FOLDER generated
@@ -167,7 +170,10 @@ slang_add_target(
# Generate the version header
#
-configure_file(${slang_SOURCE_DIR}/slang-tag-version.h.in slang-version-header/slang-tag-version.h)
+configure_file(
+ ${slang_SOURCE_DIR}/slang-tag-version.h.in
+ slang-version-header/slang-tag-version.h
+)
#
# Slang itself
@@ -176,37 +182,42 @@ configure_file(${slang_SOURCE_DIR}/slang-tag-version.h.in slang-version-header/s
set(slang_build_args
USE_EXTRA_WARNINGS
EXTRA_COMPILE_OPTIONS_PRIVATE
- # a warning is disabled for a memset boundary check.
- # everything looked fine and it is unclear why the checking fails
- $<$<CXX_COMPILER_ID:GNU>:-Wno-error=stringop-overflow>
- INCLUDE_DIRECTORIES_PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/slang-version-header
- EXPORT_MACRO_PREFIX SLANG
- EXPORT_TYPE_AS ${SLANG_LIB_TYPE}
- EXTRA_SOURCE_DIRS ${SLANG_RECORD_REPLAY_SYSTEM}
+ # a warning is disabled for a memset boundary check.
+ # everything looked fine and it is unclear why the checking fails
+ $<$<CXX_COMPILER_ID:GNU>:-Wno-error=stringop-overflow>
+ INCLUDE_DIRECTORIES_PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}/slang-version-header
+ EXPORT_MACRO_PREFIX
+ SLANG
+ EXPORT_TYPE_AS
+ ${SLANG_LIB_TYPE}
+ EXTRA_SOURCE_DIRS
+ ${SLANG_RECORD_REPLAY_SYSTEM}
)
set(slang_link_args
LINK_WITH_PRIVATE
- core
- prelude
- compiler-core
- slang-capability-defs
- slang-capability-lookup
- slang-reflect-headers
- slang-lookup-tables
- SPIRV-Headers
+ core
+ prelude
+ compiler-core
+ slang-capability-defs
+ slang-capability-lookup
+ slang-reflect-headers
+ slang-lookup-tables
+ SPIRV-Headers
)
set(slang_interface_args
# slang.h is in the project root, so include that directory in the interface
# for slang
- INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}
-)
+ INCLUDE_DIRECTORIES_PUBLIC
+ ${slang_SOURCE_DIR}
+)
set(slang_public_lib_args
- PUBLIC_HEADERS
- ${slang_SOURCE_DIR}/include/slang*.h
- ${CMAKE_CURRENT_BINARY_DIR}/slang-version-header/*.h
+ PUBLIC_HEADERS
+ ${slang_SOURCE_DIR}/include/slang*.h
+ ${CMAKE_CURRENT_BINARY_DIR}/slang-version-header/*.h
LINK_WITH_PRIVATE
- $<IF:$<BOOL:${SLANG_EMBED_CORE_MODULE}>,slang-embedded-core-module,slang-no-embedded-core-module>
- $<IF:$<BOOL:${SLANG_EMBED_CORE_MODULE_SOURCE}>,slang-embedded-core-module-source,slang-no-embedded-core-module-source>
+ $<IF:$<BOOL:${SLANG_EMBED_CORE_MODULE}>,slang-embedded-core-module,slang-no-embedded-core-module>
+ $<IF:$<BOOL:${SLANG_EMBED_CORE_MODULE_SOURCE}>,slang-embedded-core-module-source,slang-no-embedded-core-module-source>
INSTALL
)
@@ -231,7 +242,7 @@ if(NOT SLANG_EMBED_CORE_MODULE)
${slang_public_lib_args}
INSTALL_COMPONENT generators
)
- add_library(slang-without-embedded-core-module ALIAS slang)
+ add_library(slang-without-embedded-core-module ALIAS slang)
else()
# However if we're embedding core module, we need to make two different
# libraries, one with the embedded core module and one without, so first define
@@ -250,12 +261,11 @@ else()
${slang_link_args}
${slang_interface_args}
NO_SOURCE
- TARGET_NAME
- slang-without-embedded-core-module
+ TARGET_NAME slang-without-embedded-core-module
EXCLUDE_FROM_ALL
- LINK_WITH_PRIVATE
+ LINK_WITH_PRIVATE
slang-common-objects
- slang-no-embedded-core-module
+ slang-no-embedded-core-module
slang-embedded-core-module-source
OUTPUT_DIR generators
FOLDER generators
@@ -267,8 +277,7 @@ else()
${slang_link_args}
${slang_interface_args}
${slang_public_lib_args}
- LINK_WITH_PRIVATE
- slang-common-objects
+ LINK_WITH_PRIVATE slang-common-objects
NO_SOURCE
)
endif()