Skip to content

Commit

Permalink
feat: do not force the use of ninja on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
wu-vincent committed Nov 22, 2023
1 parent 8004a9a commit 45ba2ec
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,14 @@ jobs:
- uses: ilammy/msvc-dev-cmd@v1 # NOTE: this is needed to use cl.exe with the Ninja generator on Windows

- name: Build with CMake
- name: Build with CMake on Windows
if: runner.os == 'Windows'
run: |
cmake -S . -B build --preset conan-default
cmake --build build --config Release
- name: Build with CMake on Linux and macOS
if: runner.os == 'Linux' || runner.os == 'macOS'
run: |
cmake -S . -B build --preset conan-release -DCMAKE_BUILD_TYPE=Release
cmake --build build
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def layout(self):
def generate(self):
deps = CMakeDeps(self)
deps.generate()
tc = CMakeToolchain(self, generator="Ninja")
tc = CMakeToolchain(self)
tc.generate()

def build(self):
Expand Down
8 changes: 5 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ classifiers = [
build-dir = "build/{wheel_tag}"
cmake.args = ["--preset conan-release"]
cmake.build-type = "Release"
cmake.verbose = true
logging.level = "DEBUG"
wheel.packages = ["python/lanelet2"]
wheel.license-files = ["LICENSE", "CODEOWNERS"]

[tool.scikit-build.cmake.define]
LANELET2_BUILD_TESTING = "ON"
LANELET2_BUILD_TESTING = "OFF"

[[tool.scikit-build.overrides]]
if.platform-system = "win32"
cmake.args = ["--preset conan-default"]

0 comments on commit 45ba2ec

Please sign in to comment.