From 53c9378816922a7314fbcf074c862b8c7a29b38a Mon Sep 17 00:00:00 2001 From: Robert Langlois Date: Mon, 22 Aug 2022 09:48:34 -0700 Subject: [PATCH] Fix windows wheel deployment (#298) * Fix windows wheel deployment * Update windows compiler * Update generator --- .github/workflows/python.yml | 4 ++-- CMakeLists.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 07cbcabe3..21f30e206 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -48,11 +48,11 @@ jobs: run: docker run --rm -v ${{github.workspace}}/:/io ezralanglois/interop_centos7 sh /io/tools/package.sh /io /io/dist travis OFF Release cp311-cp311 - name: Windows Package Python - if: matrix.os == 'windows-2016' + if: matrix.os == 'windows-2019' shell: cmd run: | python -m pip install --upgrade pip setuptools wheel numpy - tools\package.bat Release "Visual Studio 15 2017 Win64" package_wheel "-DENABLE_APPS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_CSHARP=OFF -DPython_EXECUTABLE=${{ steps.cpver.outputs.python-path }}" -DENABLE_PORTABLE=ON + tools\package.bat Release "Visual Studio 16 2019" package_wheel "-DENABLE_APPS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_CSHARP=OFF -DPython_EXECUTABLE=${{ steps.cpver.outputs.python-path }}" -DENABLE_PORTABLE=ON -A x64 - name: Mac OSX Package Python if: matrix.os == 'macOS-latest' diff --git a/CMakeLists.txt b/CMakeLists.txt index 117b09e8a..1cd5a337f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,9 @@ endif() project(InterOp) +project(interop) +message(STATUS "CMake Version: ${CMAKE_VERSION}") +message(STATUS "CMake Generator: ${CMAKE_GENERATOR} ${CMAKE_GENERATOR_PLATFORM} ${CMAKE_GENERATOR_TOOLSET}") set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) enable_testing()