diff --git a/.gitmodules b/.gitmodules index b275c48..904b6b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "zoost"] path = zoost url = https://www.sinxmiao.cn/taynpg/zoost +[submodule "cxxLibrary"] + path = cxxLibrary + url = https://www.sinxmiao.cn/taynpg/cxxLibrary diff --git a/.vscode/settings.json b/.vscode/settings.json index 67093f5..64a87f3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,7 +25,7 @@ "-Wno-dev" ], "cmake.configureSettings": { - "CMAKE_TOOLCHAIN_FILE": "${env:VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake" + //"CMAKE_TOOLCHAIN_FILE": "${env:VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake" }, "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", diff --git a/CMakeLists.txt b/CMakeLists.txt index 75ab01a..36a3113 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,5 +28,6 @@ message(STATUS "Version file config to: ${CMAKE_CURRENT_BINARY_DIR}") include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(zoost) +add_subdirectory(cxxLibrary) add_subdirectory(strReplace) add_subdirectory(fileUpdater) \ No newline at end of file diff --git a/cxxLibrary b/cxxLibrary new file mode 160000 index 0000000..d1b8734 --- /dev/null +++ b/cxxLibrary @@ -0,0 +1 @@ +Subproject commit d1b8734ccc6970677aed91bf2064572991390ecd diff --git a/fileUpdater/CMakeLists.txt b/fileUpdater/CMakeLists.txt index 550b0b9..d232813 100644 --- a/fileUpdater/CMakeLists.txt +++ b/fileUpdater/CMakeLists.txt @@ -10,23 +10,8 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() -find_package(fmt REQUIRED) -find_package(tinyxml2 REQUIRED) -find_package(CLI11 REQUIRED) -find_package(spdlog REQUIRED) -find_package(Boost REQUIRED COMPONENTS locale filesystem nowide) - add_executable(fileUpdater main.cpp) -target_link_libraries(fileUpdater PRIVATE - fmt::fmt - Boost::locale - Boost::filesystem - Boost::nowide - CLI11::CLI11 - spdlog::spdlog - tinyxml2::tinyxml2 - zoost -) +target_link_libraries(fileUpdater PRIVATE cxxLibrary zoost) include(GNUInstallDirs) install(TARGETS fileUpdater diff --git a/fileUpdater/main.cpp b/fileUpdater/main.cpp index a581182..6344231 100644 --- a/fileUpdater/main.cpp +++ b/fileUpdater/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/script/AutoPack.bat b/script/AutoPack.bat index 13b379b..5acf1d3 100644 --- a/script/AutoPack.bat +++ b/script/AutoPack.bat @@ -1,7 +1,7 @@ @echo off echo Config CMake... -cmake -B..\build -S..\ -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%VCPKG_DIR%\scripts\buildsystems\vcpkg.cmake" -A x64 +cmake -B..\build -S..\ -DCMAKE_BUILD_TYPE=Release -A x64 if errorlevel 1 ( echo CMake Failed. pause diff --git a/strReplace/CMakeLists.txt b/strReplace/CMakeLists.txt index 8f31d0d..dfae5a6 100644 --- a/strReplace/CMakeLists.txt +++ b/strReplace/CMakeLists.txt @@ -2,7 +2,5 @@ cmake_minimum_required(VERSION 3.16) project(strReplace LANGUAGES CXX) -find_package(Boost REQUIRED) - add_executable(strReplace main.cpp) -target_link_libraries(strReplace PRIVATE Boost::headers) \ No newline at end of file +target_link_libraries(strReplace PRIVATE cxxLibrary zoost) \ No newline at end of file diff --git a/zoost b/zoost index 925faa9..78c9c4b 160000 --- a/zoost +++ b/zoost @@ -1 +1 @@ -Subproject commit 925faa9ac3c654c5875b58cbc0fde313c7bf3975 +Subproject commit 78c9c4b8873424fc2bc0ae03bed34cd302515c1a