wiwpwiwpw

Author: vicentebolea

.github/ctest_configure.cmake

@@ -1,13 +1,12 @@
 # This script is used to configure the build and submit the results to CDash.
 set(cmake_args
+  ${CTEST_CMAKE_EXTRA_OPTIONS}
   -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
   -DBUILD_TESTING_FULL=${BUILD_TESTING_FULL}
   -DZFP_WITH_OPENMP=${ZFP_WITH_OPENMP}
   -DBUILD_ZFPY=${BUILD_ZFPY}
-  -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}
-  -DPYTHON_LIBRARY=${PYTHON_LIBRARY}
 )
 
 message("cmake_args:${cmake_args}")

.github/workflows/tests.yml

@@ -49,7 +49,6 @@ jobs:
           -DCTEST_CMAKE_GENERATOR="Unix Makefiles"
           -DCTEST_SITE="Github"
           -DCTEST_BUILD_NAME="${{matrix.os}}-${{matrix.cxx_compiler}}"
-          -DCTEST_BUILD_FLAGS="-j"
 
     steps:
       - uses: actions/checkout@v4
@@ -79,6 +78,9 @@ jobs:
           echo "LDFLAGS=\"-L$(brew --prefix llvm)/lib\"" >> $GITHUB_ENV
           echo "CPPFLAGS=\"-I$(brew --prefix llvm)/include\"" >> $GITHUB_ENV
 
+      - if: github.event_name == 'pull_request'
+        run: echo "CDASH_ARGS=${CDASH_ARGS} -DCTEST_UPDATE_VERSION_OVERRIDE=${{ github.event.pull_request.head.sha }}" > "${GITHUB_ENV}"
+
       - name: Run CMake
         id: cmake
         run: >-
@@ -98,3 +100,83 @@ jobs:
       - name: Run Tests
         id: test
         run: ctest -VV -S .github/ctest_test.cmake ${{ env.CDASH_ARGS }}
+
+  win:
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - generator: Visual Studio 16 2019
+            os: windows-2019
+            platform: x64
+            arch: x64
+            build_type: Release
+
+          - generator: Visual Studio 16 2019
+            os: windows-2019
+            platform: x86
+            arch: Win32
+            build_type: Release
+
+          - generator: Visual Studio 17 2022
+            os: windows-2022
+            platform: x64
+            arch: x64
+            build_type: Release
+
+          - generator: Visual Studio 17 2022
+            os: windows-2022
+            platform: x86
+            arch: Win32
+            build_type: Release
+
+    defaults:
+      run:
+        shell: bash
+    env:
+      CDASH_ARGS: >-
+          -DCTEST_BINARY_DIRECTORY="${{github.workspace}}\\build"
+          -DCTEST_BUILD_NAME="${{matrix.os}}-${{matrix.platform}}"
+          -DCTEST_CMAKE_EXTRA_OPTIONS="-A ${{matrix.arch}}"
+          -DCTEST_CMAKE_GENERATOR="${{matrix.generator}}"
+          -DCTEST_SITE="Github"
+          -DCTEST_SOURCE_DIRECTORY="${{github.workspace}}"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: TheMrMilchmann/setup-msvc-dev@v3
+        with:
+          arch: ${{matrix.platform}}
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+          architecture: ${{matrix.platform}}
+
+      - name: Install zfpy dependencies
+        run: |
+          python -m pip install cython
+          python -m pip install oldest-supported-numpy
+          python -m pip install setuptools
+
+      - if: github.event_name == 'pull_request'
+        run: echo "CDASH_ARGS=${CDASH_ARGS} -DCTEST_UPDATE_VERSION_OVERRIDE=${{ github.event.pull_request.head.sha }}" > "${GITHUB_ENV}"
+
+      - name: Run CMake
+        id: cmake
+        run: >-
+          ctest -VV -S .github/ctest_configure.cmake ${{ env.CDASH_ARGS }}
+          -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
+          -DBUILD_TESTING_FULL=ON
+          -DZFP_WITH_OPENMP=OFF
+          -DBUILD_ZFPY=ON
+      - name: Build
+        id: build
+        run: ctest -VV -S .github/ctest_build.cmake ${{ env.CDASH_ARGS }}
+      - name: Run Tests
+        id: test
+        run: ctest -C ${{ matrix.build_type }} -VV -S .github/ctest_test.cmake ${{ env.CDASH_ARGS }}

appveyor.yml

@@ -2,42 +2,16 @@ version: 1.0.1-{build}
 
 environment:
   # zfpy only build for Release builds (otherwise need debug python libs python27_d.lib)
-  matrix:
-    - COMPILER: msvc
-      GENERATOR: Visual Studio 15 2017 Win64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      PLATFORM: x64
-      BUILD_TYPE: Release
-      PYTHON_VERSION: 38
-
-    - COMPILER: msvc
-      GENERATOR: Visual Studio 15 2017
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      PLATFORM: Win32
-      BUILD_TYPE: Release
-      PYTHON_VERSION: 38
-
-    - COMPILER: msvc
-      GENERATOR: Visual Studio 14 2015 Win64
-      PLATFORM: x64
-      BUILD_TYPE: Release
-      PYTHON_VERSION: 38
-
-    - COMPILER: msvc
-      GENERATOR: Visual Studio 14 2015
-      PLATFORM: Win32
-      BUILD_TYPE: Release
-      PYTHON_VERSION: 38
-
-    - COMPILER: mingw
-      GENERATOR: MinGW Makefiles
-      PLATFORM: Win32
-      BUILD_TYPE: Release
-
-    - COMPILER: mingw-w64
-      GENERATOR: MinGW Makefiles
-      PLATFORM: x64
-      BUILD_TYPE: Release
+#  matrix:
+#    - COMPILER: mingw
+#      GENERATOR: MinGW Makefiles
+#      PLATFORM: Win32
+#      BUILD_TYPE: Release
+#
+#    - COMPILER: mingw-w64
+#      GENERATOR: MinGW Makefiles
+#      PLATFORM: x64
+#      BUILD_TYPE: Release
 
 install:
   - if "%COMPILER%"=="mingw" set PATH=C:\MinGW\bin;%PATH%
@@ -54,16 +28,6 @@ install:
         $env:PYTHON_LIB_PATH = "$env:PYTHON_DIR\libs\python$env:PYTHON_VERSION.lib"
       }
 
-  # placing these behind a conditional for some reason prevents CMake from picking up the virtualenv
-  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" set PATH=%PYTHON_DIR%;%PYTHON_DIR%\Scripts;%PATH%
-  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" pip install virtualenv
-  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" set VIRTUALENV_NAME=pyVirtualEnv
-  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" virtualenv %VIRTUALENV_NAME%
-  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" "%VIRTUALENV_NAME%\\Scripts\\activate.bat"
-  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" pip install -r python\requirements.txt
-  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" python --version
-
-
 build_script:
   - sh appveyor.sh
   # uncomment to enable interactive remote desktop mode

cmake/CTestCustom.cmake.in

@@ -5,6 +5,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
   "ld: warning: directory not found for option '-L/opt/homebrew/opt/llvm/lib'"
   "Using deprecated NumPy API, disable it with"
   "clang: warning: argument unused during compilation: '-fstack-clash-protection'"
+  "warning LNK4197:.*googletest"
 )
 list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE)
 list(APPEND CTEST_CUSTOM_TESTS_IGNORE)