Skip to content

Commit fb4b6eb

Browse files
hananiahhsuhananiahhsu
committed
【AL-78】增加spdlog
1 parent 9f15405 commit fb4b6eb

185 files changed

Lines changed: 33851 additions & 22 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: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##########################################################################################################
22
#--Date: 2021.03.10
33
#--Project: SolidRender
4-
#--Author: xu xu
4+
#--Author: hubery.x.hsu
55
#--Note:位于SolidRender顶级目录下面
66
#--2021.10.03: 增加INSTALL项目，实现工程的自动安装功能
77
# 今日对工程的生成目录做重大调整，以后禁止VS工程的路径与源码同目录
@@ -18,15 +18,16 @@ project(SolidDesigner VERSION 1.1.0 LANGUAGES CXX DESCRIPTION "SolidRender is
1818
#-----------------------------------------------------------------------------
1919
# 编译系统设置
2020
#-----------------------------------------------------------------------------
21-
# 指定是否使用编译器特定的扩展
22-
set(CMAKE_CXX_EXTENSIONS OFF)
2321

2422
#设置C++标准
25-
set(CMAKE_CXX_STANDARDS 11)
23+
set(CMAKE_CXX_STANDARD 17)
2624

2725
# 是否强制要求C++标准为${CMAKE_CXX_STANDARD},如果为OFF则可能使用旧的标准
2826
set(CMAKE_CXX_STANDARD_REQUIRED YES)
2927

28+
# 指定是否使用编译器特定的扩展
29+
set(CMAKE_CXX_EXTENSIONS OFF)
30+
3031
#VS /MT模式的设置
3132
message("The cmake source dir is:")
3233
message("${CMAKE_SOURCE_DIR}")
@@ -165,15 +166,42 @@ endif()
165166
#-----------------------------------------------------------------------------
166167
# 定义全局的链接路径
167168
#-----------------------------------------------------------------------------
168-
set(ALICE_LibDir, ${CMAKE_BINARY_DIR}/${Alice}/${Configuration})
169+
message("ALICE_LIB_DIR: ")
170+
171+
if(CMAKE_GENERATOR MATCHES "Visual Studio")
172+
# VS: 有平台子目录（x64/Win32），并且是多配置
173+
set(ALICE_LIB_DIR "${CMAKE_BINARY_DIR}/${CMAKE_VS_PLATFORM_NAME}/$<CONFIG>")
169174

175+
elseif(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
176+
# Ninja 多配置（CMake 3.17+）
177+
set(ALICE_LIB_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>")
170178

179+
elseif(CMAKE_GENERATOR STREQUAL "Ninja")
180+
# Ninja 单配置：依赖 CMAKE_BUILD_TYPE
181+
# 例：cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
182+
set(ALICE_LIB_DIR "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
183+
184+
else()
185+
# 其他生成器兜底：先按“多配置”判断
186+
if(CMAKE_CONFIGURATION_TYPES)
187+
set(ALICE_LIB_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>")
188+
else()
189+
set(ALICE_LIB_DIR "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
190+
endif()
191+
endif()
192+
193+
message("${ALICE_LIB_DIR}")
171194
#-----------------------------------------------------------------------------
172195
# 定义GNU标准的安装目录（GNUInstallDirs.cmake）
173196
#-----------------------------------------------------------------------------
174197
include(GNUInstallDirs)
175198
set(CMAKE_INSTALL_LIBDIR "lib")
176199

200+
#-----------------------------------------------------------------------------
201+
# 设置SPDLOG
202+
#-----------------------------------------------------------------------------
203+
set(SPDLOG_HEADER_ONLY ON CACHE BOOL "" FORCE)
204+
set(SPDLOG_FMT_EXTERNAL OFF CACHE BOOL "" FORCE)
177205

178206
#-----------------------------------------------------------------------------
179207
# 定义源代码的路径

‎Designer/APP/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//#include "AliceNew.h"
55
//#include "AliceIApplicationProxyManager.h"
66
//#include "AliceTransferOwnership.h"
7-
//#include "AliceDebugMessage.h"
7+
//#include "AliceDiagnosticMacro.h"
88

99
using namespace log4cplus::helpers;
1010
//using namespace alice;

‎Designer/DB/SolidDesignerModel/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ FILE(GLOB HEADER_FILES "${PROJECT_SOURCE_DIR}/Designer/DB/SolidDesignerModel/*.h
1919
#source_group("" FILES ${HEADER_FILES})
2020

2121
#-----------------------------------------------------------------------------
22-
# 库文件链接路径(ALICE_LibDir 在上级定义了)
22+
# 库文件链接路径(ALICE_LIB_DIR 在上级定义了)
2323
#-----------------------------------------------------------------------------
24-
link_directories(${ALICE_LibDir})
24+
link_directories(${ALICE_LIB_DIR})
2525

2626
#-----------------------------------------------------------------------------
2727
# 头文件搜索路径

‎Designer/DB/SolidDesignerModel/SolidDesignerModel.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#pragma once
2-
// ´ËÍ·Îļþ°üº¬DLLµ¼³öµÄºê
3-
#include "AliceMacroDefines.h"
1+
#pragma once
2+
// 此头文件包含DLL导出的宏
3+
#include "AliceMacroDefinitions.h"
44
#include <iostream>
55
#ifdef SOLID_DESIGNER_MODEL_HOME
66
#define SOLIDDESIGNER_MODEL_EXPORT DLL_EXPORT

‎Designer/Interaction/SolidDesignerInteraction/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ FILE(GLOB HEADER_FILES "${PROJECT_SOURCE_DIR}/Designer/Interaction/SolidDesigner
1818
#source_group("" FILES ${HEADER_FILES})
1919

2020
#-----------------------------------------------------------------------------
21-
# 库文件链接路径(ALICE_LibDir 在上级定义了)
21+
# 库文件链接路径(ALICE_LIB_DIR 在上级定义了)
2222
#-----------------------------------------------------------------------------
23-
link_directories(${ALICE_LibDir})
23+
link_directories(${ALICE_LIB_DIR})
2424

2525
#-----------------------------------------------------------------------------
2626
# 头文件搜索路径

‎Designer/Interaction/SolidDesignerInteraction/SolidDesignerInteraction.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#pragma once
2-
// ´ËÍ·Îļþ°üº¬DLLµ¼³öµÄºê
3-
#include "AliceMacroDefines.h"
1+
#pragma once
2+
// 此头文件包含DLL导出的宏
3+
#include "AliceMacroDefinitions.h"
44
#include <iostream>
55
#ifdef SOLID_DESIGNER_INTERACTION_HOME
66
#define SOLID_DESIGNER_INTERACTION_EXPORT DLL_EXPORT

‎Designer/UI/SolidDesignerUI/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ source_group("resources" FILES ${RESOURCES})
3131

3232

3333
#-----------------------------------------------------------------------------
34-
# 库文件链接路径(ALICE_LibDir 在上级定义了)
34+
# 库文件链接路径(ALICE_LIB_DIR 在上级定义了)
3535
#-----------------------------------------------------------------------------
36-
link_directories(${ALICE_LibDir})
36+
link_directories(${ALICE_LIB_DIR})
3737

3838
#-----------------------------------------------------------------------------
3939
# 头文件搜索路径

‎Designer/UI/SolidDesignerUI/SolidDesignerUI.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#pragma once
2-
// ´ËÍ·Îļþ°üº¬DLLµ¼³öµÄºê
3-
#include "AliceMacroDefines.h"
1+
#pragma once
2+
// 此头文件包含DLL导出的宏
3+
#include "AliceMacroDefinitions.h"
44
#include <iostream>
55
#ifdef ALICE_UI_ROBOT_HOME
66
#define ALICE_UI_ROBOT_EXPORT DLL_EXPORT

‎Externals/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
add_subdirectory(pugixml)
88

9-
9+
add_subdirectory(spdlog)
1010

1111

1212

‎Externals/spdlog/.clang-format‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: Google
4+
AccessModifierOffset: -4
5+
Standard: c++17
6+
IndentWidth: 4
7+
TabWidth: 4
8+
UseTab: Never
9+
ColumnLimit: 100
10+
AlignAfterOpenBracket: Align
11+
BinPackParameters: false
12+
AlignEscapedNewlines: Left
13+
AlwaysBreakTemplateDeclarations: Yes
14+
PackConstructorInitializers: Never
15+
BreakConstructorInitializersBeforeComma: false
16+
IndentPPDirectives: BeforeHash
17+
SortIncludes: Never
18+
...
19+

0 commit comments

Comments
 (0)