Skip to content

Commit 8e438ae

Browse files
committed
Merge branch 'master' into ai-dev
2 parents f1ee768 + 13eaa26 commit 8e438ae

5 files changed

Lines changed: 3 additions & 294 deletions

File tree

.github/workflows/cpack-deb-debian.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ jobs:
5858
submodules: "recursive"
5959
- name: Install build dependencies
6060
run: |
61-
apt-get install -y build-essential ninja-build qtbase5-dev qttools5-dev cmake pkgconf bash libspdlog-dev
61+
apt-get install -y build-essential ninja-build qt6-base-dev qt6-tools-dev qt6-svg-dev qt6-image-formats-plugins qt6-translations-l10n cmake pkgconf bash libspdlog-dev
6262
- name: Build
6363
run: |
6464
mkdir build
6565
cd build
66-
cmake .. -GNinja -DEMBED_TRANSLATIONS=OFF -DEMBED_DOCS=OFF -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_DEB=ON -DLEMON_BUILD_INFO="Build for Debian" -DLEMON_BUILD_EXTRA_INFO="Build on $(uname -sr)"
66+
cmake .. -GNinja -DEMBED_TRANSLATIONS=OFF -DEMBED_DOCS=OFF -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_DEB=ON -DLEMON_BUILD_INFO="Build for Debian" -DLEMON_BUILD_EXTRA_INFO="Build on $(uname -sr)" -DLEMON_QT6=ON
6767
cmake --build . --target package --parallel $(nproc)
6868
- name: Get package name
6969
shell: bash

.github/workflows/linux-static.yml

Lines changed: 0 additions & 89 deletions
This file was deleted.

.github/workflows/macos.yml

Lines changed: 0 additions & 82 deletions
This file was deleted.

.github/workflows/windows.yml

Lines changed: 0 additions & 113 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
4242

4343
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
4444

45-
option(LEMON_QT6 "Use Qt6 for Debugging" OFF)
45+
option(LEMON_QT6 "Use Qt6 for Debugging" ON)
4646
LEMONLOG(LEMON_QT6)
4747
if(LEMON_QT6)
4848
cmake_policy(SET CMP0072 NEW)
@@ -76,13 +76,6 @@ add_compile_definitions(SPDLOG_BUILD_SHARED=OFF)
7676
set(spdlog_DIR ${CMAKE_SOURCE_DIR}/3rdparty/spdlog)
7777
add_subdirectory(3rdparty/spdlog)
7878

79-
if(WIN32)
80-
add_compile_options("/std:c++17")
81-
add_compile_definitions(UNICODE _UNICODE)
82-
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
83-
set(GUI_TYPE WIN32)
84-
endif()
85-
8679
if(UNIX AND NOT APPLE)
8780
find_program(LSB_RELEASE_EXEC lsb_release)
8881
execute_process(COMMAND ${LSB_RELEASE_EXEC} -is

0 commit comments

Comments
 (0)