minor cleanup of MinGW-related scripts

LMMS · Jun 27, 2024 · e0915b8 · e0915b8
1 parent 68ea3f5
commit e0915b8
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 139 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,8 +37,7 @@ jobs:
         run: |
           ccache --zero-stats
           source /opt/qt5*/bin/qt5*-env.sh || true
-          mkdir build && cd build
-          cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
+          cmake -S . -B build -DCMAKE_INSTALL_PREFIX=./install $CMAKE_OPTS
       - name: Build
         run: cmake --build build
       - name: Run tests
@@ -194,8 +193,11 @@ jobs:
       - name: Configure
         run: |
           ccache --zero-stats
-          mkdir build && cd build
-          ../cmake/build_win${{ matrix.arch }}.sh
+          cmake -S . \
+                -B build \
+                -DCMAKE_INSTALL_PREFIX=./install \
+                -DCMAKE_TOOLCHAIN_FILE="./cmake/toolchains/MinGW-W64-${{ matrix.arch }}.cmake" \
+                $CMAKE_OPTS
       - name: Build
         run: cmake --build build
       - name: Package

diff --git a/cmake/build_win32.sh b/cmake/build_win32.sh
diff --git a/cmake/build_win64.sh b/cmake/build_win64.sh
diff --git a/cmake/toolchains/MinGW-W64-32.cmake b/cmake/toolchains/MinGW-W64-32.cmake
@@ -0,0 +1,2 @@
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win32.cmake)
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/MinGW-W64.cmake)
diff --git a/cmake/toolchains/MinGW-W64-64.cmake b/cmake/toolchains/MinGW-W64-64.cmake
@@ -0,0 +1,4 @@
+SET(CMAKE_TOOLCHAIN_FILE_32			"${CMAKE_CURRENT_LIST_DIR}/MinGW-W64-32.cmake")
+
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win64.cmake)
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/MinGW-W64.cmake)
diff --git a/cmake/toolchains/Ubuntu-MinGW-W64-32.cmake b/cmake/toolchains/Ubuntu-MinGW-W64-32.cmake
diff --git a/cmake/toolchains/Ubuntu-MinGW-W64-64.cmake b/cmake/toolchains/Ubuntu-MinGW-W64-64.cmake
diff --git a/cmake/toolchains/Ubuntu-MinGW-X-Trusty-32.cmake b/cmake/toolchains/Ubuntu-MinGW-X-Trusty-32.cmake
diff --git a/cmake/toolchains/Ubuntu-MinGW-X-Trusty-64.cmake b/cmake/toolchains/Ubuntu-MinGW-X-Trusty-64.cmake
diff --git a/.../toolchains/common/Ubuntu-MinGW-W64.cmake → cmake/toolchains/common/MinGW-W64.cmake b/.../toolchains/common/Ubuntu-MinGW-W64.cmake → cmake/toolchains/common/MinGW-W64.cmake
@@ -1,5 +1,8 @@
-# Toolchain for Ubuntu MinGw compiler shipped with the mingw-w64 and
-# g++-mingw-w64 packages
+
+SET(CMAKE_SYSTEM_NAME               Windows)
+SET(CMAKE_SYSTEM_VERSION            1)
+
+# Toolchain for MinGW compiler
 SET(TOOLCHAIN_PREFIX      ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32)
 set(CMAKE_C_COMPILER      ${TOOLCHAIN_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER    ${TOOLCHAIN_PREFIX}-g++)
@@ -14,4 +17,8 @@ IF(WIN64)
 	SET(CMAKE_CXX_COMPILER32 ${TOOLCHAIN_PREFIX32}-g++)
 ENDIF()
 
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/WinCrossCompile.cmake)
+# Search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# Search for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/cmake/toolchains/common/Ubuntu-MinGW-X-Trusty.cmake b/cmake/toolchains/common/Ubuntu-MinGW-X-Trusty.cmake
diff --git a/cmake/toolchains/common/Win32.cmake b/cmake/toolchains/common/Win32.cmake
@@ -1,5 +1,3 @@
-SET(CMAKE_SYSTEM_NAME        Windows)
-SET(CMAKE_SYSTEM_VERSION     1)
 
 SET(CMAKE_SYSTEM_PROCESSOR   i686)
 

diff --git a/cmake/toolchains/common/Win64.cmake b/cmake/toolchains/common/Win64.cmake
@@ -1,5 +1,3 @@
-SET(CMAKE_SYSTEM_NAME        Windows)
-SET(CMAKE_SYSTEM_VERSION     1)
 
 SET(CMAKE_SYSTEM_PROCESSOR          x86_64)
 SET(CMAKE_SYSTEM_PROCESSOR32        i686)

diff --git a/cmake/toolchains/common/WinCrossCompile.cmake b/cmake/toolchains/common/WinCrossCompile.cmake