Skip to content

Commit e50505f

Browse files
feihongmrbean-bremen
authored andcommitted
CMake CI Process Validation
1 parent 7644da8 commit e50505f

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
libqt5svg5-dev qttools5-dev libqt5xmlpatterns5-dev qtmultimedia5-dev qtdeclarative5-dev \
3434
qtwebengine5-dev libqt5webkit5-dev
3535
else
36-
sudo apt-get install -y qt6-base-dev qt6-base-private-dev qt6-5compat-dev qt6-qmake qt6-base-dev-tools \
36+
sudo apt-get install -y qt6-base-dev qt6-base-private-dev qt6-5compat-dev qt6-base-dev-tools \
3737
libqt6svg6-dev qt6-multimedia-dev qt6-declarative-dev qt6-webengine-dev
3838
fi
3939

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
1111
find_package(Python3 COMPONENTS Development)
1212

1313
set(PYTHONQT_SUFFIX Qt${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}-Python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
14+
get_filename_component(QTDIR "${Qt${QT_VERSION_MAJOR}_DIR}" PATH)
15+
get_filename_component(QTDIR "${QTDIR}" PATH)
16+
get_filename_component(QTDIR "${QTDIR}" PATH)
17+
set(ENV{QTDIR} "${QTDIR}")
1418

1519
add_subdirectory(generator)
1620
add_subdirectory(src)

0 commit comments

Comments
 (0)