Skip to content

Commit

Permalink
Merge pull request #1 from memsharded/review
Browse files Browse the repository at this point in the history 
review
  • Loading branch information
@ibis-hdl
ibis-hdl authored Dec 4, 2024
2 parents e4a1b1c + 8dedf00 commit 29d7d61
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 875 deletions.
352 changes: 12 additions & 340 deletions CMakePresets.json
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,25 @@
{
"version": 8,
"include": [
"cmake/presets/gnuc.json",
"cmake/presets/clang.json",
"cmake/presets/clang-libcpp.json",
"cmake/presets/msvc.json",
"cmake/presets/msvc-cl.json",
"ConanCMakePresets.json"
],
"configurePresets": [
{
"name": "gcc",
"displayName": "GnuC",
"description": "GnuC compiler",
"inherits": [
"condition-linux",
"ninja-multi-config",
"conan-default",
"cmake-default-configure-settings",
"default-install-settings",
"default-environment"
]
},
{
"name": "clang",
"displayName": "Clang",
"description": "Clang compiler",
"inherits": [
"condition-anyOf-linux-or-darwin",
"ninja-multi-config",
"clang-release-build-type",
"conan-default",
"cmake-default-configure-settings",
"default-install-settings",
"default-environment"
]
},
{
"name": "clang-libc++",
"displayName": "Clang-libc++",
"description": "Clang-libc++ compiler",
"inherits": [
"condition-linux",
"ninja-multi-config",
"clang-libc++-release-build-type",
"conan-default",
"cmake-default-configure-settings",
"default-install-settings",
"default-environment"
]
},
{
"name": "msvc",
"displayName": "MSVC",
"description": "Microsoft Visual Studio C++ compiler",
"inherits": [
"condition-windows",
"windows-x64-arch",
"ninja-multi-config",
"msvc-release-build-type",
"conan-default",
"cmake-default-configure-settings",
"default-install-settings",
"default-environment"
]
},
{
"name": "msvc-cl",
"displayName": "MSVC-Cl",
"description": "Microsoft Visual Studio bundled Clang C++ compiler",
"inherits": [
"condition-windows",
"windows-x64-arch",
"ninja-multi-config",
"msvc-clang-release-build-type",
"conan-default",
"cmake-default-configure-settings",
"default-install-settings",
"default-environment"
]
"generator": "Ninja Multi-Config",
"inherits": [
"conan-default"
],
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_CONFIGURATION_TYPES": "Debug;Release;RelWithDebInfo",
"CMAKE_DEFAULT_BUILD_TYPE": "Release",
"CMAKE_EXPORT_COMPILE_COMMANDS": true,
"CMAKE_C_COMPILER": "gcc",
"CMAKE_CXX_COMPILER": "g++"
}
}
],
"buildPresets": [
Expand All @@ -101,275 +42,6 @@
"inherits": [
"conan-debug"
]
},
{
"name": "clang-release",
"displayName": "Release",
"description": "Release build with Clang",
"configuration": "Release",
"configurePreset": "clang",
"inherits": [
"conan-release"
]
},
{
"name": "clang-debug",
"displayName": "Debug",
"description": "Debug build with Clang",
"configuration": "Debug",
"configurePreset": "clang",
"inherits": [
"conan-debug"
]
},
{
"name": "clang-libc++-release",
"displayName": "Release",
"description": "Release build with Clang libc++",
"configuration": "Release",
"configurePreset": "clang-libc++",
"inherits": [
"conan-release"
]
},
{
"name": "clang-libc++-debug",
"displayName": "Debug",
"description": "Debug build with Clang libc++",
"configuration": "Debug",
"configurePreset": "clang-libc++",
"inherits": [
"conan-debug"
]
},
{
"name": "msvc-release",
"displayName": "Release",
"description": "Release build with Microsoft Visual Studio",
"configuration": "Release",
"configurePreset": "msvc",
"inherits": [
"conan-release"
]
},
{
"name": "msvc-debug",
"displayName": "Debug",
"description": "Debug build with Microsoft Visual Studio",
"configuration": "Debug",
"configurePreset": "msvc",
"inherits": [
"conan-debug"
]
},
{
"name": "msvc-cl-release",
"displayName": "Release",
"description": "Release build with Microsoft Visual Studio bundled Clang C++ compiler",
"configuration": "Release",
"configurePreset": "msvc-cl",
"inherits": [
"conan-release"
]
},
{
"name": "msvc-cl-debug",
"displayName": "Debug",
"description": "Debug build with Microsoft Visual Studio bundled Clang C++ compiler",
"configuration": "Debug",
"configurePreset": "msvc-cl",
"inherits": [
"conan-debug"
]
}
],
"testPresets": [
{
"name": "test-gcc-release",
"displayName": "Release",
"description": "Test GnuC build",
"configurePreset": "gcc",
"inherits": [
"conan-release",
"default-testPreset"
]
},
{
"name": "test-gcc-debug",
"displayName": "Debug",
"description": "Test GnuC build",
"configurePreset": "gcc",
"inherits": [
"conan-debug",
"default-testPreset"
]
},
{
"name": "test-clang-release",
"displayName": "Release",
"description": "Test Clang build",
"configurePreset": "clang",
"inherits": [
"conan-release",
"default-testPreset"
]
},
{
"name": "test-clang-debug",
"displayName": "Debug",
"description": "Test Clang build",
"configurePreset": "clang",
"inherits": [
"conan-debug",
"default-testPreset"
]
},
{
"name": "test-clang-libc++-release",
"displayName": "Release",
"description": "Test Clang libc++ build",
"configurePreset": "clang-libc++",
"inherits": [
"conan-release",
"default-testPreset"
]
},
{
"name": "test-clang-libc++-debug",
"displayName": "Debug",
"description": "Test Clang libc++ build",
"configurePreset": "clang-libc++",
"inherits": [
"conan-debug",
"default-testPreset"
]
},
{
"name": "test-msvc-release",
"displayName": "Release",
"description": "Test Microsoft Visual Studio build",
"configurePreset": "msvc",
"inherits": [
"conan-release",
"default-testPreset"
]
},
{
"name": "test-msvc-debug",
"displayName": "Debug",
"description": "Test Microsoft Visual Studio build",
"configurePreset": "msvc",
"inherits": [
"conan-debug",
"default-testPreset"
]
},
{
"name": "test-msvc-cl-release",
"displayName": "Release",
"description": "Test Microsoft Visual Studio bundled Clang build",
"configurePreset": "msvc-cl",
"inherits": [
"conan-release",
"default-testPreset"
]
},
{
"name": "test-msvc-cl-debug",
"displayName": "Debug",
"description": "Test Microsoft Visual Studio bundled Clang build",
"configurePreset": "msvc-cl",
"inherits": [
"conan-debug",
"default-testPreset"
]
}
],
"workflowPresets": [
{
"name": "GnuC Debug",
"steps": [
{
"type": "configure",
"name": "gcc"
},
{
"type": "build",
"name": "gcc-debug"
},
{
"type": "test",
"name": "test-gcc-debug"
}
]
},
{
"name": "GnuC Release",
"steps": [
{
"type": "configure",
"name": "gcc"
},
{
"type": "build",
"name": "gcc-release"
},
{
"type": "test",
"name": "test-gcc-release"
}
]
},
{
"name": "Clang Release",
"steps": [
{
"type": "configure",
"name": "clang"
},
{
"type": "build",
"name": "clang-release"
},
{
"type": "test",
"name": "test-clang-release"
}
]
},
{
"name": "Clang libc++ Release",
"steps": [
{
"type": "configure",
"name": "clang-libc++"
},
{
"type": "build",
"name": "clang-libc++-release"
},
{
"type": "test",
"name": "test-clang-libc++-release"
}
]
},
{
"name": "MSVC Release",
"steps": [
{
"type": "configure",
"name": "msvc"
},
{
"type": "build",
"name": "msvc-release"
},
{
"type": "test",
"name": "test-msvc-release"
}
]
}
]
}
18 changes: 18 additions & 0 deletions build.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import os, shutil, subprocess

def run(cmd):
os.system(cmd)


try:
shutil.rmtree("build")
except:
pass


run("conan version")
run('conan install . --build=missing -s build_type=Release '
'-c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config"')
run('conan install . --build=missing -s build_type=Debug '
'-c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config"')
run("cmake --list-presets")
Loading

0 comments on commit 29d7d61

Please sign in to comment.