diff --git a/.clang-format b/.clang-format index 039810c..7269284 100644 --- a/.clang-format +++ b/.clang-format @@ -70,7 +70,11 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: true SpacesInSquareBrackets: false +<<<<<<< HEAD Standard: Cpp11 +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -146,7 +150,14 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: true SpacesInSquareBrackets: false +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation ... +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index de4c453..4149c84 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,11 +1,16 @@ [*] charset = utf-8 +<<<<<<< HEAD end_of_line = crlf +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false max_line_length = 120 tab_width = 4 +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -946,3 +951,25 @@ ij_python_wrap_long_lines = false [{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}] ij_toml_keep_indents_on_empty_lines = false +======= +trim_trailing_whitespace = true + +[{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] +# In yaml, a two-space indent is used by default in many of the solutions we integrate with. +# Examples are GitHub Actions and Kubernetes +indent_size = 2 + +[{*.h,*.hpp,*.hxx,*.c,*.cpp,*.cxx}] +# .clang-format should take precedence, but for editors which do not do that we're adding those settings here, too. +indent_style = tab + +[*.red] +# Those are yaml files, but do use a 4 space indent +indent_size = 4 + +[{*.markdown,*.md}] +# In markdown a [double whitespace at the end of a line acts as a line break](https://www.markdownguide.org/basic-syntax/#line-breaks). +# Even though it's controversial to use it for that purpose (there are alternatives like using the `
` html tag), +# let's not break it accidentally in files that already use the double whitespace. +trim_trailing_whitespace = false +>>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 25185dc..81b89fe 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,10 @@ *.pch # Compiled Dynamic libraries +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates *.so *.dylib *.dll @@ -29,6 +33,7 @@ __pycache__/ # User generated local cmake configuration CMakeUserPresets.json +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -37,3 +42,7 @@ CMakeUserPresets.json ### VCPKG ### # Temporary measure which fixes build agent issue vcpkg_registry_cache/ +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index db04686..fce626e 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -73,7 +73,11 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite") param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache") param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") +<<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates } diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 6433401..dd600a9 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -24,7 +24,10 @@ val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release") +<<<<<<< HEAD val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", "Release", "x64-windows-release-with-dev-features") +======= +>>>>>>> template/carbonengine/resources-updates object Project : Project({ id("Windows") @@ -34,7 +37,10 @@ object Project : Project({ buildType(Internal) buildType(TrinityDev) buildType(Release) +<<<<<<< HEAD buildType(ReleaseDevFeatures) +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -63,7 +69,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite") param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache") param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") +<<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates } vcs { @@ -91,7 +101,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) scriptContent = """ REM unfortunately ninja does not find the VS environment otherwise REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir +<<<<<<< HEAD call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64 +======= + call "%env.VSDEV_BAT_PATH%" -arch=x64 +>>>>>>> template/carbonengine/resources-updates echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%'] echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%'] echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%'] diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 6780beb..fc7086e 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -8,7 +8,11 @@ import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot object Project : Project({ +<<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates params { /* before changing carbon_ref, make sure to disable automatic settings synchronization on teamcity */ diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index 034dbb1..552c757 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -20,7 +20,11 @@ class UniversalBuild() : BuildType({ param("x64-bin-path", "bin/macOS/x64") param("arm64-bin-path", "bin/macOS/arm64") text("file-matchers", +<<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates label = "lipo-build matchers", description = """ -m '*.so:lib' to tell the tool to lipo together .so files and output the fat binaries to lib/. diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index 05f72b9..e0eea92 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -27,7 +27,11 @@ class Publish(perforce_publish_path: String) : BuildType({ param("env.TC_BUILD_URL", "%teamcity.serverUrl%/viewLog.html?buildId=%teamcity.build.id%") text("eve_branch_shortname", "", label = "Branch Name", description = """The name of the branch, for example MAINLINE""", display = ParameterDisplay.PROMPT, allowEmpty = false) param("env.TC_BUILDID", "%teamcity.build.id%") +<<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") +======= + param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") +>>>>>>> template/carbonengine/resources-updates param("env.P4PORT", "p4is.ccp.ad.local:1666") param("env.TC_EVE_BRANCH_SHORTNAME", "%eve_branch_shortname%") param("env.TC_EVE_PROJECT", "%project%") @@ -259,4 +263,8 @@ class Publish(perforce_publish_path: String) : BuildType({ } }) -val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") \ No newline at end of file +<<<<<<< HEAD +val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index a67ddd6..995e568 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -1,9 +1,15 @@ 4.0.0 +<<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources Carbon_Resources_dsl +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates 1.0-SNAPSHOT diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b78a72..797f9c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.0) @@ -78,11 +79,23 @@ target_include_directories(resources ) get_target_property(_SOURCES resources SOURCES) +======= +cmake_minimum_required(VERSION 3.16) +project(CarbonTemplateProject VERSION 1.0.0) + +include(cmake/CcpBuildConfigurations.cmake) +include(cmake/CcpTargetConfigurations.cmake) + +ccp_add_library(target_name SHARED) + +get_target_property(_SOURCES target_name SOURCES) +>>>>>>> template/carbonengine/resources-updates source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Sources" FILES ${_SOURCES} ) +<<<<<<< HEAD add_subdirectory(cli) # Enable testing based on option set (on by default) @@ -96,11 +109,24 @@ endif () # Provide an install target if this is the top level project only if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) +======= +set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") + +target_include_directories(target_name + PUBLIC + $ + $ +) + +# Provide an install target if this is the top level project only +if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) +>>>>>>> template/carbonengine/resources-updates # Determine if/when to generate/build documentation. The rules are as follows: # - If running locally - Build documentation is OFF by default # - If running on a build agent (TeamCity) - Build documentation is ON by default # - If -DBUILD_DOCUMENTATION=ON/OFF flag is explicitly set, use it. set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF) +<<<<<<< HEAD if (DEFINED ENV{TEAMCITY_VERSION}) set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) endif () @@ -114,6 +140,22 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/doc/source) set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/doc/build) +======= + if(DEFINED ENV{TEAMCITY_VERSION}) + set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) + endif() + message(STATUS "Document generation settings: default=${BUILD_DOCUMENTATION_DEFAULT_FLAG}, option BUILD_DOCUMENTATION=${BUILD_DOCUMENTATION}") + option(BUILD_DOCUMENTATION "Build Documentation" ${BUILD_DOCUMENTATION_DEFAULT_FLAG}) + + if(BUILD_DOCUMENTATION) + # Set up sphinx build for Python autodoc comments. + set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/doc/source) + set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/doc/build) + + find_package(Python3 COMPONENTS Interpreter REQUIRED) + include(cmake/CcpDocsGenerator.cmake) + +>>>>>>> template/carbonengine/resources-updates create_carbon_docs_sphinx_target( PYTHON_EXE ${Python3_EXECUTABLE} VENV_NAME docs_generation_venv @@ -126,6 +168,7 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) INSTALL_DESTINATION documentation ) +<<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) endif () @@ -150,3 +193,57 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ) endif () +======= + add_dependencies(Sphinx target_name) + endif() + + + option(INSTALL_TO_MONOLITH "Install this package to a perforce branch vendor folder - provided for backwards compatability" OFF) + if (INSTALL_TO_MONOLITH) + include(cmake/CcpMonolithVendorConfig.cmake) + include(cmake/CcpPackageConfigHelpers.cmake) + + # Install rule to ensure that our runtime and linker files are in the expected, platform-specific folders + install( + TARGETS target_name + EXPORT package_nameTarget + CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES} + LIBRARY DESTINATION ${CCP_VENDOR_LIB_PATH} + ARCHIVE DESTINATION ${CCP_VENDOR_LIB_PATH} + RUNTIME DESTINATION ${CCP_VENDOR_BIN_PATH} + ) + + # Generate target configuration for the monolith + configure_ccp_vendor_config_file( + TARGET target_name + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/package_nameConfig.cmake" + DEPENDENCIES "" + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/package_nameConfig.cmake DESTINATION .) + install(DIRECTORY python DESTINATION . FILES_MATCHING PATTERN "*.py") + else () + # Install rule for available public headers + install( + TARGETS target_name + EXPORT package_nameTarget + CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/package_name + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin + ) + + install(EXPORT package_nameTarget + DESTINATION share/package_name + FILE package_name.cmake + ) + + install( + FILES package_nameConfig.cmake + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/package_name) + endif() + + install(DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "*.h") + +endif() +>>>>>>> template/carbonengine/resources-updates diff --git a/CMakePresets.json b/CMakePresets.json index b1daeae..f3a8160 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -12,6 +12,7 @@ "binaryDir": "${sourceDir}/.cmake-build-${presetName}", "cacheVariables": { "VCPKG_USE_HOST_TOOLS": "ON", +<<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/customized_toolchain/triplets", "BUILD_DOCUMENTATION": "ON", @@ -20,6 +21,12 @@ }, "environment": { "VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" +======= + "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" + }, + "environment": { + "PATH_TO_VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -47,7 +54,11 @@ "name": "x64-windows", "inherits": "windows", "cacheVariables": { +<<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/x64-windows-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -56,7 +67,11 @@ "inherits": "osx", "cacheVariables": { "CMAKE_OSX_ARCHITECTURES": "arm64", +<<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/arm64-osx-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/arm64-osx-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -65,7 +80,11 @@ "inherits": "osx", "cacheVariables": { "CMAKE_OSX_ARCHITECTURES": "x86_64", +<<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/x64-osx-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-osx-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -106,6 +125,7 @@ } }, { +<<<<<<< HEAD "name": "x64-windows-release-with-dev-features", "inherits": "x64-windows-release", "cacheVariables": { @@ -113,6 +133,8 @@ } }, { +======= +>>>>>>> template/carbonengine/resources-updates "name": "arm64-osx-internal", "inherits": "arm64-osx", "cacheVariables": { diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 76ca7f5..48845e1 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -74,7 +74,11 @@ PROJECT_ICON = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index 7e65f15..bdf4393 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -6,8 +6,13 @@ # -- Project information ----------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index f0f0b8f..05af601 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,3 +1,4 @@ +<<<<<<< HEAD resources Documentation ============================== @@ -42,3 +43,33 @@ Contents This project is under active development. +======= +project_name Documentation +========================== + +*project_name* is generated from `carbon-template`. + +.. + Top-level table of contents + List documentation sources below + +.. toctree:: + :maxdepth: 1 + :caption: Contents + +.. hint:: + This project supports documentation authoring using *reStructuredText* and the *MyST* markdown language. + + Python docstrings are pulled in automatically using *autodoc* + +.. seealso:: + + `reST usages`_ + For authoring documentation using *reStructuredText*. + + `MyST with Sphinx`_ + For authoring documentation using *MyST* flavored markdown. + +.. _reST usages: https://www.sphinx-doc.org/en/master/usage/restructuredtext +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates diff --git a/include/include.md b/include/include.md new file mode 100644 index 0000000..1cdda44 --- /dev/null +++ b/include/include.md @@ -0,0 +1,6 @@ +# /include + +This folder is where all relevant includes for the project should be stored, such as `.h` files. + +[See an example here](https://github.com/ccpgames/carbon-blueexposure/tree/main/include) + diff --git a/package_nameConfig.cmake b/package_nameConfig.cmake new file mode 100644 index 0000000..8255c9c --- /dev/null +++ b/package_nameConfig.cmake @@ -0,0 +1,34 @@ +include(CMakeFindDependencyMacro) + +# ${CMAKE_CURRENT_LIST_DIR}/project_name.cmake is generated automatically by cmake as part of the install step +include(${CMAKE_CURRENT_LIST_DIR}/package_name.cmake) + +# Please specify all of this projects transitive dependencies here +# In order for a consuming cmake project system to locate any transitive dependencies of this project, they must be +# specified here in a call to find_dependency(...) +# +# Example: +# +# My project CMakeLists.txt file looks like this: +# ------------------------ +# MyProject/CMakeLists.txt +# ------------------------ +# +# find_package(a CONFIG NO_CMAKE_PATH REQUIRED) +# find_package(b CONFIG NO_CMAKE_PATH REQUIRED) +# find_package(c CONFIG NO_CMAKE_PATH REQUIRED) +# target_link_libraries(MyProjectTarget PRIVATE package_a PUBLIC package_b INTERFACE package_c) +# . . . +# + +# Then the myprojectConfig file (this file) looks like this: +#-------------------------------- +# MyProject/myprojectConfig.cmake +# ------------------------------- +# +# include(CMakeFindDependencyMacro) +# include(${CMAKE_CURRENT_LIST_DIR}/myproject.cmake) +# +# find_dependency(b CONFIG NO_CMAKE_PATH REQUIRED) +# find_dependency(c CONFIG NO_CMAKE_PATH REQUIRED) +# \ No newline at end of file diff --git a/tests/tests.md b/tests/tests.md index f2ffc7d..4d1f61a 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -2,4 +2,11 @@ This folder is where all the tests for the project should be stored, whether they be Python tests or C++ tests. +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) +======= +[See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) + +[See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) + +>>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 9c0fca4..bdb758e 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,15 +1,31 @@ { "default-registry": { "kind": "git", +<<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates "repository": "https://github.com/microsoft/vcpkg.git" }, "registries": [ { "kind": "git", +<<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "addd8867a1553f4b7866bb7a36deb84bd59bd1f9", "packages": ["carbon-*", "python3", "bsdiff-drake127"] +======= + "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", + "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", + "packages": ["carbon-pdmprotowrapper", "carbon-pdm", "carbon-blueexposure", "carbon-blue", "carbon-exefile", "carbon-exefile-interpreter", "carbon-io", "carbon-math"] + }, + { + "kind": "git", + "repository": "git@github.com:carbonengine/vcpkg-registry.git", + "baseline": "303eacceb8ce9a0aa9a061f00ab2c11e8725ab2d", + "packages": ["python3", "carbon-core", "carbon-scheduler", "tracy", "greenlet", "ccp-debug-info", "crashpad", "zlib"] +>>>>>>> template/carbonengine/resources-updates } ] } diff --git a/vcpkg.json b/vcpkg.json index 02c947d..ad38e87 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,7 @@ { "dependencies": [ { +<<<<<<< HEAD "name": "argparse", "version>=": "2.2" }, @@ -63,6 +64,17 @@ { "name": "argparse", "version": "2.2" +======= + "name": "python3", + "version>=": "3.12.9#1", + "host": true + } + ], + "overrides": [ + { + "name": "protobuf", + "version": "3.6.0.1" +>>>>>>> template/carbonengine/resources-updates } ] }