Skip to content

Commit 81db79a

Browse files
committed
Add ARM build to build_cmake.yml workflow
Try to fix intel build and fix deprecated wranings in CMakeLists.txt also
1 parent 37cd9ed commit 81db79a

File tree

2 files changed

+14
-26
lines changed

2 files changed

+14
-26
lines changed

.github/workflows/build_cmake.yml

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,12 @@ jobs:
1919
build_type: "Release", cc: "clang", cxx: "clang++",
2020
build_gen: "Unix Makefiles"
2121
}
22-
# - {
23-
# name: "macOS Latest Release (Apple Silicon)",
24-
# os: macos-14-arm64,
25-
# build_type: "Release", cc: "clang", cxx: "clang++",
26-
# build_gen: "Unix Makefiles"
27-
# }
28-
# - {
29-
# name: "macOS Latest Debug (Apple Silicon)",
30-
# os: macos-14-arm64,
31-
# build_type: "Debug", cc: "clang", cxx: "clang++",
32-
# build_gen: "Unix Makefiles"
33-
# }
22+
- {
23+
name: "macOS Latest Release (Apple Silicon)",
24+
os: macos-latest,
25+
build_type: "Release", cc: "clang", cxx: "clang++",
26+
build_gen: "Unix Makefiles"
27+
}
3428
- {
3529
name: "Windows Latest MSVC Release",
3630
os: windows-latest,
@@ -43,6 +37,12 @@ jobs:
4337
with:
4438
fetch-depth: 0
4539

40+
- name: Check MAC CPU Architecture
41+
shell: bash
42+
run: |
43+
uname -m
44+
if: matrix.config.os != 'windows-latest'
45+
4646
- name: Install libiconv (Windows)
4747
uses: suisei-cn/actions-download-file@v1
4848
with:
@@ -133,18 +133,6 @@ jobs:
133133
refreshenv
134134
if: matrix.config.os == 'windows-latest'
135135

136-
- name: Install Qt 6
137-
uses: jurplel/install-qt-action@v4
138-
with:
139-
version: 6.2.*
140-
if: matrix.config.is == 'macos-13'
141-
142-
- name: Install Qt 5
143-
uses: jurplel/install-qt-action@v4
144-
with:
145-
version: 5.*
146-
if: matrix.config.is != 'macos-13'
147-
148136
- name: Check tool versions (Linux / MacOS)
149137
shell: bash
150138
run: |

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Documents produced by Doxygen are derivative works derived from the
1212
# input used in their production; they are not affected by this license.
1313

14-
cmake_minimum_required(VERSION 3.3)
14+
cmake_minimum_required(VERSION 3.5)
1515
project(doxygen)
1616

1717
option(build_wizard "Build the GUI frontend for doxygen." OFF)
@@ -143,7 +143,7 @@ else ()
143143
endif ()
144144

145145
find_program(DOT NAMES dot)
146-
find_package(PythonInterp REQUIRED)
146+
find_package(Python REQUIRED)
147147
find_package(FLEX REQUIRED)
148148
if (FLEX_VERSION VERSION_LESS 2.5.37)
149149
message(SEND_ERROR "Doxygen requires at least flex version 2.5.37 (installed: ${FLEX_VERSION})")

0 commit comments

Comments
 (0)