diff --git a/BuildRel.bat b/BuildRel.bat index 00edb77..b97ac10 100644 --- a/BuildRel.bat +++ b/BuildRel.bat @@ -1,32 +1,23 @@ @echo off setlocal enabledelayedexpansion -where conan >nul 2>nul +where cmake >nul 2>nul if errorlevel 1 ( - echo conan not installed, pip install conan + echo cmake not installed. pause exit /b 1 ) -conan install . -s build_type=Release --build=missing +cmake -Bbuild -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release if errorlevel 1 ( - echo install package failed. + config failed. pause exit /b 1 ) -call %~dp0build\Release\generators\conanbuild.bat -cmake --preset=conan-release +cmake --build build --config Release if errorlevel 1 ( - echo config failed. - cd .. - pause - exit /b 1 -) -cmake --build --preset=conan-release -if errorlevel 1 ( - echo build failed. - cd .. + build failed. pause exit /b 1 ) diff --git a/conanfile.py b/conanfile.py deleted file mode 100644 index dffdff3..0000000 --- a/conanfile.py +++ /dev/null @@ -1,20 +0,0 @@ -from conan import ConanFile -import os - -class CompressorRecipe(ConanFile): - - settings = "os", "compiler", "build_type", "arch" - generators = "CMakeToolchain", "CMakeDeps" - - def requirements(self): - self.requires("libcurl/8.18.0") - self.requires("openssl/3.6.1") - self.requires("xlnt/1.6.1", options={"shared": True}) - self.requires("nlohmann_json/3.12.0") - self.requires("cli11/2.6.0") - self.requires("spdlog/1.17.0") - self.requires("fmt/12.1.0") - - def layout(self): - self.folders.generators = os.path.join("build", str(self.settings.build_type), "generators") - self.folders.build = os.path.join("build", str(self.settings.build_type)) \ No newline at end of file