From 192eb12474108d6bc72500a96b538f2af6d9356b Mon Sep 17 00:00:00 2001 From: johndoe6345789 Date: Sat, 3 Jan 2026 22:15:51 +0000 Subject: [PATCH] Add CMake presets and update conanfile for SDL3Cpp integration --- CMakePresets.json | 48 +++++++++++++++++++++++++++++++++++++++++++ CMakeUserPresets.json | 4 +--- conanfile.py | 4 ++++ 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 CMakePresets.json diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..ba05d76 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,48 @@ +{ + "version": 3, + "vendor": { + "conan": {} + }, + "cmakeMinimumRequired": { + "major": 3, + "minor": 15, + "patch": 0 + }, + "configurePresets": [ + { + "name": "conan-release", + "displayName": "'conan-release' config", + "description": "'conan-release' configure using 'Unix Makefiles' generator", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_POLICY_DEFAULT_CMP0091": "NEW", + "CMAKE_BUILD_TYPE": "Release" + }, + "toolchainFile": "conan_toolchain.cmake", + "binaryDir": "/home/rewrich/Documents/GitHub/SDL3CPlusPlus" + } + ], + "buildPresets": [ + { + "name": "conan-release", + "configurePreset": "conan-release", + "jobs": 12 + } + ], + "testPresets": [ + { + "name": "conan-release", + "configurePreset": "conan-release", + "execution": { + "jobs": 12 + }, + "environment": { + "PATH": "/home/rewrich/.conan2/p/b/pulse956d7717a389f/p/bin:$penv{PATH}", + "LD_LIBRARY_PATH": "/home/rewrich/.conan2/p/b/pulse956d7717a389f/p/lib:/home/rewrich/.conan2/p/b/pulse956d7717a389f/p/lib/pulseaudio:/home/rewrich/.conan2/p/b/libsn4a568b96ef5e6/p/lib:/home/rewrich/.conan2/p/b/vulka459e548170e65/p/lib:/home/rewrich/.conan2/p/b/vulkaabeb917e25e94/p/lib:$penv{LD_LIBRARY_PATH}", + "DYLD_LIBRARY_PATH": "/home/rewrich/.conan2/p/b/pulse956d7717a389f/p/lib:/home/rewrich/.conan2/p/b/pulse956d7717a389f/p/lib/pulseaudio:/home/rewrich/.conan2/p/b/libsn4a568b96ef5e6/p/lib:/home/rewrich/.conan2/p/b/vulka459e548170e65/p/lib:$penv{DYLD_LIBRARY_PATH}", + "ALSA_CONFIG_DIR": "/home/rewrich/.conan2/p/b/libalc76bf0db68b4c/p/res/alsa", + "VK_LAYER_PATH": "/home/rewrich/.conan2/p/b/vulkaabeb917e25e94/p/res/vulkan/explicit_layer.d:$penv{VK_LAYER_PATH}" + } + } + ] +} \ No newline at end of file diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json index e737125..71aeace 100644 --- a/CMakeUserPresets.json +++ b/CMakeUserPresets.json @@ -4,8 +4,6 @@ "conan": {} }, "include": [ - "build/CMakePresets.json", - "build-ninja/CMakePresets.json", - "build-ninja-msvc/CMakePresets.json" + "build/Release/generators/CMakePresets.json" ] } \ No newline at end of file diff --git a/conanfile.py b/conanfile.py index 54f2097..b46d6b1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,4 +1,5 @@ from conan import ConanFile +from conan.tools.cmake import cmake_layout class SDL3CppConan(ConanFile): name = "sdl3cpp" @@ -14,6 +15,9 @@ class SDL3CppConan(ConanFile): } generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + def layout(self): + cmake_layout(self) + def requirements(self): self.requires("lua/5.4.8") self.requires("sdl/3.2.20")