Skip to content
Snippets Groups Projects
Verified Commit fdd0aa40 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

Added formatting and shortcut to load json dependency

parent fc2a5e2c
No related branches found
No related tags found
1 merge request!97Resolve "Dokumentation vervollständigen"
find_package(spirv_cross_c_shared QUIET) find_package(spirv_cross_c_shared QUIET)
if (spirv-cross_FOUND) if (spirv-cross_FOUND)
...@@ -31,4 +32,4 @@ else() ...@@ -31,4 +32,4 @@ else()
message(${vkcv_config_msg} " SPIRV Cross - " ${SPIRV_CROSS_VERSION}) message(${vkcv_config_msg} " SPIRV Cross - " ${SPIRV_CROSS_VERSION})
endif () endif ()
endif () endif ()
\ No newline at end of file
...@@ -141,20 +141,20 @@ namespace vkcv ...@@ -141,20 +141,20 @@ namespace vkcv
const Context &getContext() const; const Context &getContext() const;
/** /**
* Creates a #Core with given @p applicationName and @p applicationVersion for your application. * Creates a #Core with given @p applicationName and @p applicationVersion for your application.
* *
* It is also possible to require a specific amount of queues, ask for specific queue-flags or * It is also possible to require a specific amount of queues, ask for specific queue-flags or
* extensions. This function will take care of the required arguments as best as possible. * extensions. This function will take care of the required arguments as best as possible.
* *
* To pass a valid version for your application, you should use #VK_MAKE_VERSION(). * To pass a valid version for your application, you should use #VK_MAKE_VERSION().
* *
* @param[in] applicationName Name of the application * @param[in] applicationName Name of the application
* @param[in] applicationVersion Version of the application * @param[in] applicationVersion Version of the application
* @param[in] queueFlags (optional) Requested flags of queues * @param[in] queueFlags (optional) Requested flags of queues
* @param[in] instanceExtensions (optional) Requested instance extensions * @param[in] instanceExtensions (optional) Requested instance extensions
* @param[in] deviceExtensions (optional) Requested device extensions * @param[in] deviceExtensions (optional) Requested device extensions
* @return New instance of #Context * @return New instance of #Context
*/ */
static Core create(const char *applicationName, static Core create(const char *applicationName,
uint32_t applicationVersion, uint32_t applicationVersion,
const std::vector<vk::QueueFlagBits>& queueFlags = {}, const std::vector<vk::QueueFlagBits>& queueFlags = {},
......
use_git_submodule("${vkcv_asset_loader_lib_path}/json" json_status) find_package(nlohmann_json QUIET)
if (${json_status}) if (nlohmann_json_FOUND)
set(JSON_BuildTests OFF CACHE INTERNAL "") list(APPEND vkcv_libraries nlohmann_json::nlohmann_json)
else()
use_git_submodule("${vkcv_asset_loader_lib_path}/json" json_status)
add_subdirectory(${vkcv_asset_loader_lib}/json) if (${json_status})
set(JSON_BuildTests OFF CACHE INTERNAL "")
list(APPEND vkcv_asset_loader_libraries nlohmann_json::nlohmann_json)
add_subdirectory(${vkcv_asset_loader_lib}/json)
list(APPEND vkcv_asset_loader_libraries nlohmann_json::nlohmann_json)
endif ()
endif () endif ()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment