diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2024-05-17 16:09:34 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2024-05-17 16:09:34 +0200 |
| commit | 40ed7b9b5e1892d204b1ce56bbaf394bc7ecf12d (patch) | |
| tree | 3a7e8a0aff4e5bf8d40eb6bf8fedf79cea03c7d5 | |
| parent | be261a9595d7744332583586c625315b95688410 (diff) | |
| download | wanda-40ed7b9b5e1892d204b1ce56bbaf394bc7ecf12d.tar.xz wanda-40ed7b9b5e1892d204b1ce56bbaf394bc7ecf12d.zip | |
build: update build configuration
| -rw-r--r-- | .conan/default | 7 | ||||
| -rw-r--r-- | .conan2/profiles/debug | 4 | ||||
| -rw-r--r-- | .conan2/profiles/default | 5 | ||||
| -rw-r--r-- | .conan2/profiles/release | 4 | ||||
| -rw-r--r-- | .vscode/settings.json | 5 | ||||
| -rw-r--r-- | .vscode/tasks.json | 20 | ||||
| -rw-r--r-- | conan.lock | 5 | ||||
| -rw-r--r-- | conanfile.py | 5 |
8 files changed, 19 insertions, 36 deletions
diff --git a/.conan/default b/.conan/default new file mode 100644 index 0000000..d893989 --- /dev/null +++ b/.conan/default @@ -0,0 +1,7 @@ +include(default) + +[settings] +compiler.cppstd=20 + +[conf] +tools.cmake.cmaketoolchain:generator=Ninja Multi-Config diff --git a/.conan2/profiles/debug b/.conan2/profiles/debug deleted file mode 100644 index e4afcbe..0000000 --- a/.conan2/profiles/debug +++ /dev/null @@ -1,4 +0,0 @@ -include(./default) - -[settings] -build_type=Debug diff --git a/.conan2/profiles/default b/.conan2/profiles/default deleted file mode 100644 index f334f1a..0000000 --- a/.conan2/profiles/default +++ /dev/null @@ -1,5 +0,0 @@ -include(default) - -[settings] -compiler.cppstd=20 - diff --git a/.conan2/profiles/release b/.conan2/profiles/release deleted file mode 100644 index 70bcd36..0000000 --- a/.conan2/profiles/release +++ /dev/null @@ -1,4 +0,0 @@ -include(./default) - -[settings] -build_type=Release diff --git a/.vscode/settings.json b/.vscode/settings.json index 38fea8b..4733f54 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,4 @@ { - "C_Cpp.intelliSenseEngine": "disabled", - "cmake.sourceDirectory": "${workspaceFolder}/source", - "cmake.useCMakePresets": "always", - "cmake.mergedCompileCommands": "${workspaceFolder}/compile_commands.json" + "cmake.useCMakePresets": "auto", } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c7cc9d6..ff5fb7f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,33 +2,21 @@ "version": "2.0.0", "tasks": [ { - "label": "conan: install (debug)", + "label": "conan: install", "type": "shell", "command": "conan", "args": [ "install", "--build=missing", - "--profile:host=${workspaceFolder}/.conan2/profiles/debug", + "--profile:host=${workspaceFolder}/.conan/default", "${workspaceFolder}" ] }, { - "label": "conan: install (release)", - "type": "shell", - "command": "conan", - "args": [ - "install", - "--build=missing", - "--profile:host=${workspaceFolder}/.conan2/profiles/release", - "${workspaceFolder}" - ] - }, - { - "label": "Bootstrap", + "label": "conan: bootstrap", "dependsOrder": "sequence", "dependsOn": [ - "conan: install (debug)", - "conan: install (release)" + "conan: install", ], "runOptions": { "runOn": "folderOpen" @@ -5,12 +5,13 @@ "spdlog/1.12.0#baf01ff8c9be09bb6cb6c62c1804012c%1709323024.67", "lyra/1.6.1#06fa7f247d1f93f4f5d5017cbd578376%1701546832.709", "libpng/1.6.43#c219d8f01983bac10c404fc613605eef%1708791038.007", - "libjpeg-turbo/3.0.2#1acc4234a921c5c948652e04c77d3d80%1706213428.499", + "libjpeg-turbo/3.0.3#5a1be473b22bcf5536e0b091764b0cc8%1715190175.365", "fmt/10.2.1#9199a7a0611866dea5c8849a77467b25%1704415120.216", "catch2/3.5.4#d346ca291f8f62040fd9c1a891654711%1712851544.79", - "boost/1.83.0#2d83de19c46523acd9cc8f678141b0d4%1711443135.771" + "boost/1.83.0#21fcda49ae156b727862fea3db61e68c%1715614148.563" ], "build_requires": [ + "ninja/1.12.1#e5397d3ce52a127f189df5f32c2f4306%1715439974.169", "nasm/2.15.05#058c93b2214a49ca1cfe9f8f26205568%1703550024.076", "cmake/3.29.2#2b84343440461e8c5952c034d896fb67%1713311246.014" ], diff --git a/conanfile.py b/conanfile.py index 97abe18..11d3a29 100644 --- a/conanfile.py +++ b/conanfile.py @@ -34,7 +34,10 @@ class Wanda(ConanFile): ) exports_sources = ("source/*",) test_requires = ("catch2/[>=3.4]",) - tool_requires = ("cmake/[>=3.27]",) + tool_requires = ( + "cmake/[>=3.27]", + "ninja/[>=1.12]", + ) def requirements(self): self.requires("boost/[~1.83]", transitive_headers=not self.options.nolibs, options={ |