diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a7b8b522..70f691a8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 diff --git a/conanfile.py b/conanfile.py index 3d73fd45..36a3f213 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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): diff --git a/pyproject.toml b/pyproject.toml index 524cb4c1..9f0bde3d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" \ No newline at end of file +LANELET2_BUILD_TESTING = "OFF" + +[[tool.scikit-build.overrides]] +if.platform-system = "win32" +cmake.args = ["--preset conan-default"] \ No newline at end of file