Skip to content

Commit 841ca9b

Browse files
authored
Fix Windows build on CI (#199)
* Update introduction CI steps Signed-off-by: Uilian Ries <uilianries@gmail.com> * Disable lzma on Windows Signed-off-by: Uilian Ries <uilianr@jfrog.com> * Revert ci script Signed-off-by: Uilian Ries <uilianr@jfrog.com> --------- Signed-off-by: Uilian Ries <uilianries@gmail.com> Signed-off-by: Uilian Ries <uilianr@jfrog.com>
1 parent 83ec345 commit 841ca9b

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

examples/libraries/sdl2/introduction/ci_test_example.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
# calling CMake directly
2727

2828
if platform.system() == "Windows":
29-
run("cmake . -G \"Visual Studio 17 2022\" -DCMAKE_TOOLCHAIN_FILE=./build/generators/conan_toolchain.cmake -DCMAKE_POLICY_DEFAULT_CMP0091=NEW")
30-
run("cmake --build . --config Release")
29+
run("cmake -S . -B build -G \"Visual Studio 17 2022\" -DCMAKE_TOOLCHAIN_FILE=./build/generators/conan_toolchain.cmake -DCMAKE_POLICY_DEFAULT_CMP0091=NEW")
30+
run("cmake --build build --config Release")
3131
else:
32-
run("cmake . -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=build/Release/generators/conan_toolchain.cmake -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=Release")
33-
run("cmake --build .")
32+
run("cmake -S . -B build -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=build/Release/generators/conan_toolchain.cmake -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=Release")
33+
run("cmake --build build")

examples/libraries/sdl2/introduction/conanfile.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[requires]
22
sdl_image/[~2.6]
33
sdl_ttf/[~2.0]
4-
sdl/[~2.28]
4+
sdl/[~2.28]
5+
6+
[options]
7+
libtiff/*:lzma=False
58

69
[generators]
710
CMakeToolchain

0 commit comments

Comments
 (0)