ninemine/Convention-CPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新关于nlohmann的依赖

Browse Source
This commit is contained in:
LiuBai095
2025-07-29 11:01:54 +08:00
parent e87627dec9
commit 4ab5c2378a
5 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -1,3 +1,3 @@
[submodule "Convention/[nlohmann]"] [submodule "Convention/nlohmann"]
path = Convention/[nlohmann] path = Convention/nlohmann
url = https://github.com/nlohmann/json.git url = https://github.com/nlohmann/json.git

1
Convention/CMakeLists.txt
View File

@@ -1,5 +1,6 @@
message("Convention: --- ----- ----- ----- ----- --") message("Convention: --- ----- ----- ----- ----- --")
include_directories(${PROJECT_SOURCE_DIR}/Convention/nlohmann/include)
install(DIRECTORY [Runtime] install(DIRECTORY [Runtime]
DESTINATION ${CMAKE_INSTALL_PREFIX}/include DESTINATION ${CMAKE_INSTALL_PREFIX}/include
FILES_MATCHING PATTERN "*.*" FILES_MATCHING PATTERN "*.*"

1
Convention/[nlohmann]

Submodule Convention/[nlohmann] deleted from d33ecd3f3b

1
[Test]/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
add_executable(TEST test.cpp ) add_executable(TEST test.cpp )
include_directories(${PROJECT_SOURCE_DIR}/Convention/[Runtime]) include_directories(${PROJECT_SOURCE_DIR}/Convention/[Runtime])
include_directories(${PROJECT_SOURCE_DIR}/Convention/nlohmann/include)
install(TARGETS TEST install(TARGETS TEST
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

24
[Test]/test.cpp
View File

@@ -1,26 +1,10 @@
//#include"Config.hpp" #include<Config.hpp>
#include"Architecture.hpp" #include<GlobalConfig.hpp>
using namespace std; using namespace std;
using namespace Convention;
#include <iostream>
#include<vector>
#include<map>
using namespace std;
int main() int main()
{ {
double t = 0; cout << ProjectConfig().LoadProperties().FindItem<std::string>("test", "test") << endl;
for (int i = 1; i < 80; i++)
{
t += 1.0 / (double)i;
}
double k = 0;
for (int i = 1; i < 80; i++)
{
k += 1.0 / (double)i;
cout << i << ":\t" << k << "/" << t << "\t=\t" << k / t * 100 << "% current step:\t" <<
1.0 / (double)i << endl;
}
return 0;
} }