Skip to content

Commit e2a4e7d

Browse files
committed
refactor!: move headers to include/uniconv/ to avoid conflicts with libunistring
1 parent 42e7291 commit e2a4e7d

16 files changed

+19
-20
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
build/
22
.idea/
3-
vcpkg-port/
43
CMakeLists.txt
54
.github/prompts/*.md
65
doc/

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ else()
99
endif()
1010

1111
project(UniConv
12-
VERSION 3.2.2
12+
VERSION 3.3.0
1313
DESCRIPTION "High-performance C++ character encoding conversion library"
1414
LANGUAGES C CXX
1515
)
@@ -190,7 +190,7 @@ set(UNICONV_SOURCES
190190
)
191191

192192
set(UNICONV_HEADERS
193-
${CMAKE_CURRENT_SOURCE_DIR}/include/UniConv.h
193+
${CMAKE_CURRENT_SOURCE_DIR}/include/uniconv/UniConv.h
194194
)
195195

196196
# 创建库目标
@@ -341,13 +341,13 @@ if(NOT UNICONV_IS_SUBPROJECT)
341341

342342
# 安装主头文件 UniConv.h
343343
install(FILES ${UNICONV_HEADERS}
344-
DESTINATION ${UNICONV_INSTALL_INCLUDEDIR}/UniConv
344+
DESTINATION ${UNICONV_INSTALL_INCLUDEDIR}/uniconv
345345
)
346346

347347
# 安装 encodings.inc
348-
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/encodings.inc)
349-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/encodings.inc
350-
DESTINATION ${UNICONV_INSTALL_INCLUDEDIR}/UniConv
348+
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/uniconv/encodings.inc)
349+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/uniconv/encodings.inc
350+
DESTINATION ${UNICONV_INSTALL_INCLUDEDIR}/uniconv
351351
)
352352
endif()
353353

README.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ cmake --build . --config Release
137137
### 基本转换
138138

139139
```cpp
140-
#include "UniConv.h"
140+
#include <uniconv/UniConv.h>
141141

142142
int main() {
143143
auto conv = UniConv::GetInstance();

examples/branch_prediction_demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @details 展示编译时优化、分支预测、循环展开等优化技术的效果
55
*/
66

7-
#include "../include/UniConv.h"
7+
#include <uniconv/UniConv.h>
88
#include <chrono>
99
#include <iostream>
1010
#include <vector>

examples/encoding_validation_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @details 测试编码名称有效性检查功能,验证热路径方法的优化效果
55
*/
66

7-
#include "../include/UniConv.h"
7+
#include <uniconv/UniConv.h>
88
#include <iostream>
99
#include <string>
1010
#include <chrono>

examples/fetchcontent_example/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <iostream>
22
#include <string>
3-
#include "UniConv.h"
3+
#include <uniconv/UniConv.h>
44

55
int main() {
66
std::cout << "=== FetchContent UniConv Example ===" << std::endl;

examples/instance_usage_demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <memory>
1818
#include <vector>
1919
#include <thread>
20-
#include "../include/UniConv.h"
20+
#include <uniconv/UniConv.h>
2121

2222
using namespace std;
2323

examples/lru_cache_demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <chrono>
99
#include <vector>
1010
#include <iomanip>
11-
#include "../include/UniConv.h"
11+
#include <uniconv/UniConv.h>
1212

1313
using namespace std;
1414
using namespace std::chrono;

examples/parallel_batch_demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <chrono>
1111
#include <vector>
1212
#include <iomanip>
13-
#include "UniConv.h"
13+
#include <uniconv/UniConv.h>
1414

1515
using namespace std;
1616
using namespace std::chrono;

examples/simple_demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @details 演示 UniConv 库的核心编码转换功能和错误处理
55
*/
66

7-
#include "../include/UniConv.h"
7+
#include <uniconv/UniConv.h>
88
#include <iostream>
99
#include <string>
1010

0 commit comments

Comments
 (0)