更新关于nlohmann的依赖
This commit is contained in:
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -1,3 +1,3 @@
|
||||
[submodule "Convention/[nlohmann]"]
|
||||
path = Convention/[nlohmann]
|
||||
[submodule "Convention/nlohmann"]
|
||||
path = Convention/nlohmann
|
||||
url = https://github.com/nlohmann/json.git
|
||||
|
@@ -1,5 +1,6 @@
|
||||
message("Convention: --- ----- ----- ----- ----- --")
|
||||
|
||||
include_directories(${PROJECT_SOURCE_DIR}/Convention/nlohmann/include)
|
||||
install(DIRECTORY [Runtime]
|
||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/include
|
||||
FILES_MATCHING PATTERN "*.*"
|
||||
|
Submodule Convention/[nlohmann] deleted from d33ecd3f3b
@@ -1,4 +1,5 @@
|
||||
add_executable(TEST test.cpp )
|
||||
include_directories(${PROJECT_SOURCE_DIR}/Convention/[Runtime])
|
||||
include_directories(${PROJECT_SOURCE_DIR}/Convention/nlohmann/include)
|
||||
install(TARGETS TEST
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
@@ -1,26 +1,10 @@
|
||||
//#include"Config.hpp"
|
||||
#include"Architecture.hpp"
|
||||
#include<Config.hpp>
|
||||
#include<GlobalConfig.hpp>
|
||||
|
||||
using namespace std;
|
||||
|
||||
#include <iostream>
|
||||
#include<vector>
|
||||
#include<map>
|
||||
using namespace std;
|
||||
using namespace Convention;
|
||||
|
||||
int main()
|
||||
{
|
||||
double t = 0;
|
||||
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;
|
||||
cout << ProjectConfig().LoadProperties().FindItem<std::string>("test", "test") << endl;
|
||||
}
|
||||
|
Reference in New Issue
Block a user