diff options
| author | Xiaoxu Guo <ftiasch0@gmail.com> | 2024-03-10 15:02:48 +0800 |
|---|---|---|
| committer | Xiaoxu Guo <ftiasch0@gmail.com> | 2024-03-10 15:02:48 +0800 |
| commit | c4cfcf0e60f2c0692a25a210bbcd7d1693616bdd (patch) | |
| tree | 30ffaa8732416354f143289e766af88f26aa2ad8 | |
| parent | 1ad50cfcc42e08d42ac00792a4321be34f3ccee4 (diff) | |
| download | shoka-c4cfcf0e60f2c0692a25a210bbcd7d1693616bdd.tar.gz shoka-c4cfcf0e60f2c0692a25a210bbcd7d1693616bdd.zip | |
fixed conan2
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | CMakeUserPresets.json | 9 | ||||
| -rwxr-xr-x | build.sh | 4 | ||||
| -rw-r--r-- | conanfile.txt | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 290b3c5..f21914c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) -include(${CMAKE_BINARY_DIR}/conan_paths.cmake) +# include(${CMAKE_BINARY_DIR}/conan_paths.cmake) find_package(Catch2 3 REQUIRED) diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json new file mode 100644 index 0000000..06f81ff --- /dev/null +++ b/CMakeUserPresets.json @@ -0,0 +1,9 @@ +{ + "version": 4, + "vendor": { + "conan": {} + }, + "include": [ + "/home/ftiasch/Documents/shoka/Build/CMakePresets.json" + ] +}
\ No newline at end of file @@ -1,6 +1,6 @@ #!/bin/bash set -o errexit -conan install . -if Build -of Build --build -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B Build . +conan install . --output-folder=Build --build=missing +(cd Build && cmake -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ..) cmake --build Build diff --git a/conanfile.txt b/conanfile.txt index 3bdea8a..fb0f924 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,6 +1,6 @@ [requires] -catch2/3.2.0 +catch2/3.5.3 [generators] -cmake_find_package -cmake_paths +CMakeDeps +CMakeToolchain |