Skip to content

Commit

Permalink
整理 代码结构;
Browse files Browse the repository at this point in the history
  • Loading branch information
RealChuan committed Apr 15, 2024
1 parent 694bf63 commit d2c4e19
Show file tree
Hide file tree
Showing 419 changed files with 50 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
cp -f ./packaging/ubuntu/Qt-App.desktop ./bin-64/${{ matrix.build_type }}/Qt-App.desktop
cp -f ./resource/icon/app.png ./bin-64/${{ matrix.build_type }}/app.png
cp -f ./src/resource/icon/app.png ./bin-64/${{ matrix.build_type }}/app.png
cp -f ./bin-64/${{ matrix.build_type }}/plugins/* ./bin-64/${{ matrix.build_type }}
so_files=$(find ./bin-64/${{ matrix.build_type }} -maxdepth 1 -name "*.so" -printf '%P\n')
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
ls -al ./bin-64/${{ matrix.build_type }}
7z a -t7z -r -mx=9 -mmt Qt-App-${{ matrix.os }}-${{matrix.arch}}-${{ matrix.build_type }}.7z ./bin-64/${{ matrix.build_type }}/*
- name: Upload packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-${{matrix.arch}}-${{ matrix.build_type }}
path: Qt-App-${{ matrix.os }}-${{matrix.arch}}-${{ matrix.build_type }}.7z
Expand Down
11 changes: 2 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,5 @@ if(unofficial-breakpad_FOUND)
message(STATUS "found unofficial-breakpad")
endif()

add_subdirectory(utils)
add_subdirectory(resource)
add_subdirectory(gui)
add_subdirectory(3rdparty)
add_subdirectory(aggregation)
add_subdirectory(extensionsystem)
add_subdirectory(core)
add_subdirectory(plugins)
add_subdirectory(apps)
include_directories(src)
add_subdirectory(src)
13 changes: 3 additions & 10 deletions Qt-App.pro
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
TEMPLATE = subdirs
CONFIG += ordered

SUBDIRS += \
utils \
resource \
gui \
3rdparty \
aggregation \
extensionsystem \
core \
plugins \
apps
SUBDIRS += src

DISTFILES += \
doc/** \
.clang* \
LICENSE \
README*
6 changes: 2 additions & 4 deletions cmake/utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ function(add_share_library target_name)
endfunction(add_share_library)

function(add_rpath target_name)
if(CMAKE_HOST_WIN32)

elseif(CMAKE_HOST_APPLE)
if(CMAKE_HOST_APPLE)
set_target_properties(
${target_name}
PROPERTIES LINK_FLAGS "-Wl,-rpath,./:./../Frameworks:./../../Frameworks")
else()
elseif(CMAKE_HOST_LINUX)
set_target_properties(${target_name}
PROPERTIES LINK_FLAGS "-Wl,-rpath,./:./lib:./../lib")
endif()
Expand Down
4 changes: 2 additions & 2 deletions common.pri
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ CONFIG(debug, debug|release) {
APP_OUTPUT_PATH = $$PWD/$$BIN/Release
}

INCLUDEPATH += $$PWD/
DEPENDPATH += $$PWD/
INCLUDEPATH += $$PWD/src/
DEPENDPATH += $$PWD/src/

defineReplace(replaceLibName) {
unset(LIBRARY_NAME)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
add_subdirectory(utils)
add_subdirectory(resource)
add_subdirectory(gui)
add_subdirectory(3rdparty)
add_subdirectory(aggregation)
add_subdirectory(extensionsystem)
add_subdirectory(core)
add_subdirectory(plugins)
add_subdirectory(apps)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/app/app.pro → src/apps/app/app.pro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(../../common.pri)
include(../../../common.pri)

QT += core gui network widgets

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(../../common.pri)
include(../../../common.pri)

QT += core gui network widgets core5compat

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion libs.pri → src/libs.pri
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(common.pri)
include(../common.pri)

TEMPLATE = lib

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion plugins/plugins.pri → src/plugins/plugins.pri
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(../common.pri)
include(../../common.pri)

TEMPLATE = lib

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading

0 comments on commit d2c4e19

Please sign in to comment.