diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index d37b812..72b784a 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -2,11 +2,7 @@ # See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml name: CMake on multiple platforms -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] +on:: [push] jobs: build: diff --git a/CMakeLists.txt b/CMakeLists.txt index 6097e1b..b953d76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,8 @@ if(NOT GIT_EXECUTABLE) find_package(Git) endif() +find_package(Threads) + # Fetch some OpenMind include(FetchContent) FetchContent_Declare(skrypt diff --git a/libgen/CMakeLists.txt b/libgen/CMakeLists.txt index 240d156..2e3b55c 100644 --- a/libgen/CMakeLists.txt +++ b/libgen/CMakeLists.txt @@ -7,6 +7,10 @@ option(PNG_STATIC "Build static lib" ON) set(deplist libskrypt + Boost::filesystem + Boost::program_options + Boost::serialization + libjpeg-turbo/libjpeg-turbo libjpeg-turbo::turbojpeg-static ) diff --git a/picture-pattern-generate/generator.cpp b/picture-pattern-generate/generator.cpp index ab176b7..2ab3b38 100644 --- a/picture-pattern-generate/generator.cpp +++ b/picture-pattern-generate/generator.cpp @@ -42,6 +42,11 @@ int main(int argc, char** argv) std::cout << "Image pattern (formulas for channels of width, height, x, y):" << std::endl; auto names = gen::InitialVarNames(); + auto less = "x"_va.IntMod_Less("y"_va); + std::cout << "Xsecond.getVaHost(); Valuable red(StdIn("Red(w,h,x,y)"), varhost, true); Valuable green(StdIn("Green(w,h,x,y)"), varhost, true); diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..9547379 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "builtin-baseline": "3508985146f1b1d248c67ead13f8f54be5b4f5da", + "name": "generator", + "version": "1.0.0", + "description": "HPC Generator of datasets Tool", + "dependencies": [ + "boost", + "boost-chrono", + "boost-compute", + "boost-date-time", + "boost-dll", + "boost-filesystem", + "boost-gil", + "boost-iostreams", + "boost-locale", + "boost-multiprecision", + "boost-program-options", + "boost-serialization", + "boost-system", + "boost-test", + "boost-thread", + "boost-uuid", + "leveldb", + "libpng", + "zlib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +}