Skip to content

GitLab

Commit c1cb92ed authored by Michaël Roynard's avatar Michaël Roynard
Browse files

Revert range-v3 dependency

parent 10c87968
Hide whitespace changes
Inline Side-by-side
.vscode/settings.json
View file @ c1cb92ed
......@@ -60,7 +60,7 @@
"queue": "cpp",
"stack": "cpp"
},
"python.pythonPath": "venv_python37/bin/python",
"python.pythonPath": "/usr/bin/python3",
"C_Cpp.configurationWarnings": "Disabled",
"git.ignoreLimitWarning": true
}
\ No newline at end of file
.vscode/tasks.json
View file @ c1cb92ed
......@@ -15,12 +15,6 @@
"command": "ssh node7 'mkdir -p /work/mroynard/lrde/pylene/build-remote-release'",
"group": "build"
},
{
"label": "mkdir-remote-asan",
"type": "shell",
"command": "ssh node7 'mkdir -p /work/mroynard/lrde/pylene/build-remote-asan'",
"group": "build"
},
{
"label": "conan-remote",
"dependsOn": "mkdir-remote",
......@@ -35,13 +29,6 @@
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-release && source ../venv_python371/bin/activate && ../venv_python371/bin/conan install --build missing -o benchmark=True -o gtest=True -o freeimage=True ..'",
"group": "build"
},
{
"label": "conan-remote-asan",
"dependsOn": "mkdir-remote-asan",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-asan && source ../venv_python371/bin/activate && ../venv_python371/bin/conan install --build missing -o benchmark=True -o gtest=True -o freeimage=True ..'",
"group": "build"
},
{
"label": "configure-remote",
"dependsOn": "conan-remote",
......@@ -56,40 +43,18 @@
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-release && cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..'",
"group": "build"
},
{
"label": "configure-remote-asan",
"dependsOn": "conan-remote-asan",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-asan && cmake -G Ninja -DCMAKE_BUILD_TYPE=Asan -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..'",
"group": "build"
},
{
"label": "build-check-remote",
"dependsOn": "configure-remote",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote && cmake --build . --target check --config Debug -- -j12'",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote && cmake --build . --target check --config Debug -- -j12 | tee check.log.txt'",
"group": "build",
"problemMatcher": "$gcc"
},
{
"label": "only-build-check-remote",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote && cmake --build . --target check --config Debug -- -j12'",
"group": "build",
"problemMatcher": "$gcc"
},
{
"label": "build-check-remote-asan",
"dependsOn": "configure-remote-asan",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-asan && cmake --build . --target check --config Asan -- -j12'",
"group": "build",
"problemMatcher": "$gcc"
},
{
"label": "only-build-check-remote-asan",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-asan && cmake --build . --target check --config Asan -- -j12'",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote && cmake --build . --target check --config Debug -- -j12 | tee check.log.txt'",
"group": "build",
"problemMatcher": "$gcc"
},
......@@ -97,14 +62,14 @@
"label": "build-benchmarks-remote-release",
"dependsOn": "configure-remote-release",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-release && cmake --build . --target benchmarks --config Release -- -j12'",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-release && cmake --build . --target benchmarks --config Release -- -j12 | tee bench.log.txt'",
"group": "build",
"problemMatcher": "$gcc"
},
{
"label": "only-build-benchmarks-remote-release",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-release && cmake --build . --target benchmarks --config Release -- -j12'",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote-release && cmake --build . --target benchmarks --config Release -- -j12 | tee bench.log.txt'",
"group": "build",
"problemMatcher": "$gcc"
},
......@@ -120,14 +85,14 @@
"label": "build-doc-remote",
"dependsOn": "configure-remote",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote && source ../venv_python371/bin/activate && cmake --build . --target doc -- -j12'",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote && source ../venv_python371/bin/activate && cmake --build . --target doc -- -j12 | tee doc.log.txt'",
"group": "build",
"problemMatcher": "$gcc"
},
{
"label": "only-build-doc-remote",
"type": "shell",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote && source ../venv_python371/bin/activate && cmake --build . --target doc -- -j12'",
"command": "ssh node7 'cd /work/mroynard/lrde/pylene/build-remote && source ../venv_python371/bin/activate && cmake --build . --target doc -- -j12 | tee doc.log.txt'",
"group": "build",
"problemMatcher": "$gcc"
},
......
conanfile.py
View file @ c1cb92ed
......@@ -35,7 +35,7 @@ class Pylene(ConanFile):
# Requirements part of the INTERFACE
def requirements(self):
self.requires("range-v3/head@dutiona/testing")
self.requires("range-v3/0.4.0@ericniebler/stable")
self.requires("cmcstl2/0.1@dutiona/testing")
if self.options.freeimage:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment