Compare commits

..

4 Commits

Author SHA1 Message Date
William Bell
f84e5429a5 fix release.yml 2025-08-15 21:16:48 +01:00
William Bell
f4c7294267 fix release.yml 2025-08-15 21:14:17 +01:00
William Bell
be4b04a286 fix release.yml 2025-08-15 20:59:49 +01:00
William Bell
9d11122e93 fix conanfile.py 2025-08-15 20:50:58 +01:00
3 changed files with 4 additions and 9 deletions

View File

@@ -106,7 +106,7 @@ jobs:
submodules: recursive submodules: recursive
- name: Install build tools - name: Install build tools
run: choco install winflexbison mingw -y run: choco install winflexbison -y
shell: pwsh shell: pwsh
- name: Setup Python - name: Setup Python
@@ -123,13 +123,7 @@ jobs:
- name: Build with MinGW - name: Build with MinGW
run: | run: |
conan install . ` conan install .
-s compiler=gcc `
-s compiler.version=13 `
-s compiler.libcxx=libstdc++11 `
-s arch=x86_64 `
-s os=Windows `
--build=missing
conan build . conan build .
shell: pwsh shell: pwsh

View File

@@ -51,7 +51,7 @@ set_target_properties(argon PROPERTIES
find_package(BDWgc REQUIRED) find_package(BDWgc REQUIRED)
find_package(gmp REQUIRED) find_package(gmp REQUIRED)
target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s) target_compile_options(argon PRIVATE -O3 -Wall -s)
if(NOT APPLE) if(NOT APPLE)
target_link_options(argon PRIVATE -static) target_link_options(argon PRIVATE -static)
endif() endif()

View File

@@ -30,6 +30,7 @@ class ArgonConan(ConanFile):
self.folders.generators = "build" self.folders.generators = "build"
def generate(self): def generate(self):
os.environ["CONAN_NON_INTERACTIVE"] = "1"
tc = CMakeToolchain(self) tc = CMakeToolchain(self)
if os.name == "nt": # Windows if os.name == "nt": # Windows