From d91bdf585deed40f2105c7bb36f807dbe05500a4 Mon Sep 17 00:00:00 2001
From: Ian Bell <ian.bell@nist.gov>
Date: Fri, 17 Jun 2022 22:13:39 -0400
Subject: [PATCH] More verbose on windows and set proper archs
---
.github/workflows/build_cibuildwheel.yml | 4 +---
CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build_cibuildwheel.yml b/.github/workflows/build_cibuildwheel.yml
index 69f8e63..0eb8042 100644
--- a/.github/workflows/build_cibuildwheel.yml
+++ b/.github/workflows/build_cibuildwheel.yml
@@ -32,9 +32,7 @@ jobs:
CIBW_ARCHS: auto64
CIBW_ARCHS_MACOS: universal2
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=10.15
- # max number of jobs, default eqs # logical processors; https://developercommunity.visualstudio.com/t/limit-cpu-usage-of-visual-studio/436208#T-N742131
- # CIBW_ENVIRONMENT_WINDOWS: EnforceProcessCountAcrossBuilds=true MultiProcMaxCount=1
- CIBW_ENVIRONMENT_WINDOWS: PreferredToolArchitecture=x64
+ CIBW_BUILD_VERBOSITY_WINDOWS: 2
CIBW_SKIP: "*pypy*linux* *cp36*"
- uses: actions/upload-artifact@v2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26408d3..e22ad41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)
+set(CMAKE_OSX_ARCHITECTURES x86_64;arm64 CACHE INTERNAL "archs for osx")
cmake_minimum_required(VERSION 3.16)
project(teqp)
enable_testing()
--
GitLab