Merge weBIGeo #234
+33,149
−160
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| /CMakeLists.txt.user | ||
| /extern/* | ||
| /build/* | ||
| /install/* | ||
| .vs | ||
| .vscode | ||
| .qtcreator | ||
| __pycache__ | ||
| /.qtcreator/CMakeLists.txt.user | ||
| **/.qmlls.ini | ||
| /docs/project_reports | ||
| **/__pycache__/*.pyc |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Member
Author
There was a problem hiding this comment. i'm not against providing a cmake preset, but this one should be cleaned up. there are hard coded paths, alp-base sounds strange in the context of the upstream repo, generally, there is a ton of targets. imo:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| { | ||
| "version": 6, | ||
| "cmakeMinimumRequired": { | ||
| "major": 3, | ||
| "minor": 25, | ||
| "patch": 0 | ||
| }, | ||
| "configurePresets": [ | ||
| { | ||
| "name": "alp-base", | ||
| "hidden": true, | ||
| "cacheVariables": { | ||
| "ALP_ENABLE_GL_ENGINE": "OFF", | ||
| "ALP_QML_APP": "OFF", | ||
| "ALP_ENABLE_LABELS": "OFF", | ||
| "ALP_UNITTESTS": "OFF", | ||
| "ALP_WEBGPU_ENGINE": "ON", | ||
| "ALP_WEBGPU_APP": "ON", | ||
| "ALP_ENABLE_THREADING": "ON", | ||
| "ALP_ENABLE_DEV_TOOLS": "ON" | ||
| } | ||
| }, | ||
| { | ||
| "name": "msvc-base", | ||
| "hidden": true, | ||
| "inherits": "alp-base", | ||
| "generator": "Ninja", | ||
| "binaryDir": "${sourceDir}/build/${presetName}", | ||
| "installDir": "${sourceDir}/install/${presetName}", | ||
| "architecture": { | ||
| "value": "x64", | ||
| "strategy": "external" | ||
| }, | ||
| "toolset": { | ||
| "value": "host=x64", | ||
| "strategy": "external" | ||
| }, | ||
| "cacheVariables": { | ||
| "CMAKE_C_COMPILER": "cl.exe", | ||
| "CMAKE_CXX_COMPILER": "cl.exe", | ||
| "Qt6_DIR": "C:/Qt/6.10.1/msvc2022_64/lib/cmake/Qt6" | ||
| }, | ||
| "condition": { | ||
| "type": "equals", | ||
| "lhs": "${hostSystemName}", | ||
| "rhs": "Windows" | ||
| } | ||
| }, | ||
| { | ||
| "name": "msvc-debug", | ||
| "displayName": "MSVC Debug (Windows)", | ||
| "description": "Debug build using MSVC compiler", | ||
| "inherits": "msvc-base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Debug", | ||
| "CMAKE_CXX_FLAGS": "/DQT_DEBUG" | ||
| } | ||
| }, | ||
| { | ||
| "name": "msvc-release", | ||
| "displayName": "MSVC Release (Windows)", | ||
| "description": "Release build using MSVC compiler", | ||
| "inherits": "msvc-base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Release" | ||
| } | ||
| }, | ||
| { | ||
| "name": "msvc-debug-test", | ||
| "displayName": "MSVC Debug Tests (Windows)", | ||
| "description": "Debug build for unit tests using MSVC compiler", | ||
| "inherits": "msvc-debug", | ||
| "cacheVariables": { | ||
| "ALP_UNITTESTS": "ON", | ||
| "ALP_WEBGPU_APP": "OFF" | ||
| } | ||
| }, | ||
| { | ||
| "name": "msvc-release-test", | ||
| "displayName": "MSVC Release Tests (Windows)", | ||
| "description": "Release build for unit tests using MSVC compiler", | ||
| "inherits": "msvc-release", | ||
| "cacheVariables": { | ||
| "ALP_UNITTESTS": "ON", | ||
| "ALP_WEBGPU_APP": "OFF" | ||
| } | ||
| }, | ||
| { | ||
| "name": "emscripten-base", | ||
| "hidden": true, | ||
| "inherits": "alp-base", | ||
| "generator": "Ninja", | ||
| "binaryDir": "${sourceDir}/build/${presetName}", | ||
| "installDir": "${sourceDir}/install/${presetName}", | ||
| "toolchainFile": "C:/Qt/6.10.1/wasm_multithread/lib/cmake/Qt6/qt.toolchain.cmake", | ||
| "environment": { | ||
| "PATH": "C:/Qt/Tools/Ninja;$penv{PATH}", | ||
| "EMSDK": "C:/tmp/alpinemaps/emsdk" | ||
| } | ||
| }, | ||
| { | ||
| "name": "wasm-debug", | ||
| "displayName": "WebAssembly Debug", | ||
| "description": "Debug build for WebAssembly using Emscripten", | ||
| "inherits": "emscripten-base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Debug", | ||
| "CMAKE_CXX_FLAGS": "-DQT_DEBUG" | ||
| } | ||
| }, | ||
| { | ||
| "name": "wasm-release", | ||
| "displayName": "WebAssembly Release", | ||
| "description": "Release build for WebAssembly using Emscripten", | ||
| "inherits": "emscripten-base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Release" | ||
| } | ||
| }, | ||
| { | ||
| "name": "wasm-publish", | ||
| "displayName": "WebAssembly Publish", | ||
| "description": "Production build for WebAssembly using Emscripten", | ||
| "inherits": "emscripten-base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Release", | ||
| "CMAKE_CXX_FLAGS": "-DQT_NO_DEBUG_OUTPUT", | ||
| "ALP_ENABLE_WGSL_MINIFICATION": "ON" | ||
| } | ||
| } | ||
| ], | ||
| "buildPresets": [ | ||
| { | ||
| "name": "msvc-debug", | ||
| "configurePreset": "msvc-debug" | ||
| }, | ||
| { | ||
| "name": "msvc-release", | ||
| "configurePreset": "msvc-release" | ||
| }, | ||
| { | ||
| "name": "msvc-debug-test", | ||
| "configurePreset": "msvc-debug-test" | ||
| }, | ||
| { | ||
| "name": "msvc-release-test", | ||
| "configurePreset": "msvc-release-test" | ||
| }, | ||
| { | ||
| "name": "wasm-debug", | ||
| "configurePreset": "wasm-debug" | ||
| }, | ||
| { | ||
| "name": "wasm-release", | ||
| "configurePreset": "wasm-release" | ||
| }, | ||
| { | ||
| "name": "wasm-publish", | ||
| "configurePreset": "wasm-publish" | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we set the min version to qt 6.10 or 6.11?