Skip to content

Commit a25bd9a

Browse files
Charliechen114514Charliechen114514
committed
feat: update CMake Orgs And Bootstrap Window
1 parent 9cf2002 commit a25bd9a

77 files changed

Lines changed: 3657 additions & 117 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ message("Including Requested CMake Dependencies OK")
1010
# cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/toolchain.cmake -S . -B out/build
1111
# cmake -DUSE_TOOLCHAIN=windows/llvm -S . -B out/build
1212
include(cmake/check_toolchain.cmake)
13-
project(CFDesktop VERSION 0.10.3 LANGUAGES CXX C)
13+
project(CFDesktop VERSION 0.11.0 LANGUAGES CXX C)
1414

1515
# ------ Build Type Configuration ------
1616
# Validate and set build type
1717
if(NOT CMAKE_BUILD_TYPE)
18-
message(FATAL_ERROR "CMAKE_BUILD_TYPE is not set. Please specify build_type in build_*.config.ini")
18+
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (Debug Release RelWithDebInfo)" FORCE)
19+
message(STATUS "CMAKE_BUILD_TYPE not set, defaulting to: ${CMAKE_BUILD_TYPE}")
1920
endif()
2021

2122
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo")

‎Doxyfile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,5 @@ XML_OUTPUT = xml
1717
QUIET = YES
1818
WARNINGS = NO
1919

20-
PREDEFINED += Q_OBJECT=
21-
PREDEFINED += signals=public
22-
PREDEFINED += slots=
23-
PREDEFINED += emit=
2420
HIDE_UNDOC_MEMBERS = YES
2521
HIDE_UNDOC_CLASSES = YES

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### 为嵌入式设备打造的现代化 Material Design 3 桌面框架
66

7-
[![License: MIT][license-badge]] [![Version: 0.10.3][version-badge]]
7+
[![License: MIT][license-badge]] [![Version: 0.11.0][version-badge]]
88
[![C++23][cpp-badge]] [![Qt 6.8][qt-badge]] [![CMake][cmake-badge]]
99
[![Documentation][docs-badge]]
1010

@@ -224,7 +224,7 @@ cd CFDesktop
224224

225225
<!-- Badge Links -->
226226
[license-badge]: https://img.shields.io/badge/License-MIT-yellow.svg
227-
[version-badge]: https://img.shields.io/badge/version-0.10.3-blue.svg
227+
[version-badge]: https://img.shields.io/badge/version-0.11.0-blue.svg
228228
[cpp-badge]: https://img.shields.io/badge/C++-23-00599C.svg
229229
[qt-badge]: https://img.shields.io/badge/Qt-6.8-41CD52.svg
230230
[cmake-badge]: https://img.shields.io/badge/CMake-3.16+-064F8C.svg

‎base/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ target_link_libraries(cfbase PUBLIC
3333
# Set include directories
3434
# Expose both include/ (for public headers) and . (for sub-module headers like device/console)
3535
target_include_directories(cfbase PUBLIC
36-
${CMAKE_CURRENT_SOURCE_DIR}/include
37-
${CMAKE_CURRENT_SOURCE_DIR}
36+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
37+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
38+
$<INSTALL_INTERFACE:include>
3839
)
3940

4041
# Link dependencies

‎base/device/console/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ set_target_properties(cfbase_console PROPERTIES
66
POSITION_INDEPENDENT_CODE ON
77
)
88
# Define export macro since this will be linked into cfbase shared library
9-
target_compile_definitions(cfbase_console PUBLIC CFBASE_EXPORTS)
9+
target_compile_definitions(cfbase_console PRIVATE CFBASE_EXPORTS)
1010
target_include_directories(cfbase_console
1111
PUBLIC
12-
${CMAKE_CURRENT_SOURCE_DIR}/../..
12+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
13+
$<INSTALL_INTERFACE:include>
1314
PRIVATE
1415
${CMAKE_CURRENT_SOURCE_DIR}/impl
1516
)

‎base/system/cpu/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ set_target_properties(cfbase_cpu PROPERTIES
66
POSITION_INDEPENDENT_CODE ON
77
)
88
# Define export macro since this will be linked into cfbase shared library
9-
target_compile_definitions(cfbase_cpu PUBLIC CFBASE_EXPORTS)
9+
target_compile_definitions(cfbase_cpu PRIVATE CFBASE_EXPORTS)
1010
target_include_directories(cfbase_cpu
1111
PUBLIC
12-
${CMAKE_CURRENT_SOURCE_DIR}/../../include
12+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
13+
$<INSTALL_INTERFACE:include>
1314
PRIVATE
1415
${CMAKE_CURRENT_SOURCE_DIR}/../..
1516
)
@@ -35,6 +36,6 @@ elseif(UNIX)
3536
private/linux_impl/cpu_bonus.cpp
3637
private/linux_impl/cpu_features.cpp
3738
private/linux_impl/cpu_info.cpp
38-
../../utils/linux/proc_parser.cpp
39+
${CMAKE_CURRENT_SOURCE_DIR}/../../utils/linux/proc_parser.cpp
3940
)
4041
endif()

‎base/system/gpu/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ set_target_properties(cfbase_gpu PROPERTIES
99
AUTOUIC OFF
1010
)
1111
# Define export macro since this will be linked into cfbase shared library
12-
target_compile_definitions(cfbase_gpu PUBLIC CFBASE_EXPORTS)
12+
target_compile_definitions(cfbase_gpu PRIVATE CFBASE_EXPORTS)
1313
target_include_directories(cfbase_gpu
1414
PUBLIC
15-
${CMAKE_CURRENT_SOURCE_DIR}/../../include
15+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
16+
$<INSTALL_INTERFACE:include>
1617
PRIVATE
1718
${CMAKE_CURRENT_SOURCE_DIR}/../..
1819
)

‎base/system/memory/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ set_target_properties(cfbase_memory PROPERTIES
33
POSITION_INDEPENDENT_CODE ON
44
)
55
# Define export macro since this will be linked into cfbase shared library
6-
target_compile_definitions(cfbase_memory PUBLIC CFBASE_EXPORTS)
6+
target_compile_definitions(cfbase_memory PRIVATE CFBASE_EXPORTS)
77
target_include_directories(cfbase_memory
88
PUBLIC
9-
${CMAKE_CURRENT_SOURCE_DIR}/../../include
9+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
10+
$<INSTALL_INTERFACE:include>
1011
PRIVATE
1112
${CMAKE_CURRENT_SOURCE_DIR}/../..
1213
)

‎base/system/network/CMakeLists.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ add_library(cfbase_network STATIC
22
network.cpp
33
)
44

5+
target_compile_definitions(cfbase_network PRIVATE CFBASE_EXPORTS)
6+
57
target_link_libraries(cfbase_network
6-
PUBLIC Qt6::Core
8+
PUBLIC Qt6::Core
79
PRIVATE Qt6::Network
810
)
911

10-
target_include_directories(cfbase_network
12+
target_include_directories(cfbase_network
1113
PUBLIC
12-
${CMAKE_CURRENT_SOURCE_DIR}/../../include
14+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
15+
$<INSTALL_INTERFACE:include>
1316
PRIVATE
14-
${CMAKE_CURRENT_SOURCE_DIR}/../..)
17+
${CMAKE_CURRENT_SOURCE_DIR}/../..
18+
)

‎desktop/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ log_info("Desktop Buildings" "Start Configuring Desktop Buildings")
55
# ============================================================
66
add_subdirectory(base)
77
add_subdirectory(main/early_session)
8+
add_subdirectory(ui)
89

910
# ============================================================
1011
# Unified CFDesktop Shared Library
@@ -45,6 +46,7 @@ set(CFDESKTOP_STATIC_LIBS
4546
CFDesktopLog
4647
CFDesktopPathSettings
4748
CFDesktopEarlySession
49+
CFDesktopUi
4850
)
4951

5052
# Link all static libraries using --whole-archive

0 commit comments

Comments
 (0)