Update CMake for mingw builds on Travis CI

modelica-3rdparty · Apr 4, 2024 · 8c17a79 · 8c17a79
1 parent e46c648
commit 8c17a79
Showing 1 changed file with 2 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,45 +20,6 @@ env:
 
 matrix:
   include:
-    - os: linux
-      compiler: gcc-4.8
-      env:
-        - PLATFORM=linux32
-        - CFLAGS="-O3 -DNDEBUG -fPIC -msse2 -m32"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC -msse2 -m32"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux32"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: linux
-      compiler: gcc-4.8
-      env:
-        - PLATFORM=linux64
-        - CFLAGS="-O3 -DNDEBUG -fPIC"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux64"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: linux
-      compiler: clang
-      env:
-        - PLATFORM=linux64
-        - CFLAGS="-O3 -DNDEBUG -fPIC"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux64"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: osx
-      compiler: gcc
-      env:
-        - PLATFORM=darwin64
-        - CC=gcc
-        - CMAKE=cmake
-        - TARGETDIR="darwin64"
-        - GM="Unix Makefiles"
-        - MAKE=make
     - os: windows
       compiler: gcc
       env:
@@ -92,7 +53,7 @@ before_install:
         ## mostly from here: https://docs.travis-ci.com/user/reference/windows/
         [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
         choco uninstall -y mingw
-        choco upgrade --no-progress -y msys2
+        choco upgrade --no-progress -y msys2 cmake
         export msys2='cmd //C RefreshEnv.cmd '
         export msys2+='& set MSYS=winsymlinks:nativestrict '
         export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
@@ -104,7 +65,7 @@ before_install:
         $msys2 pacman --sync --noconfirm --needed autoconf autoconf-archive automake automake-wrapper binutils gettext git libtool m4 make pkg-config mingw-w64-{i686,x86_64}-toolchain mingw-w64-{i686,x86_64}-clang mingw-w64-{i686,x86_64}-make mingw-w64-{i686,x86_64}-cmake mingw-w64-{i686,x86_64}-extra-cmake-modules mingw-w64-{i686,x86_64}-{gcc,binutils} mingw-w64-{i686,x86_64}-hdf5
         ## Install more MSYS2 packages from https://packages.msys2.org/base here
         taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
-        export PATH=/C/tools/msys64/mingw64/bin:$PATH
+        export PATH=/C/tools/msys64/mingw64/bin:/C/Program\ Files/CMake:/C/Program\ Files/CMake/bin:$PATH
         ;;
     esac
   - curl https://bitbucket.org/Swyter/bitbucket-curl-upload-to-repo-downloads/raw/default/upload-to-bitbucket.sh -O -J -L