diff --git a/doc/Install_develop.rst b/doc/Install_develop.rst index d981c5e49e039aade05160e804745e153dcb92d5..e29e7a20a82c429dd1cc83a15fc75b702b828d85 100644 --- a/doc/Install_develop.rst +++ b/doc/Install_develop.rst @@ -22,7 +22,7 @@ which have ``make`` installed, type this in your command line terminal: Building with ``vcpkg`` ~~~~~~~~~~~~~~~~~~~~~~~ -You can use the vcpkg package manager to install the dependencies (`vcpkg.json`). It's included as +Instead of Conan, you can use the vcpkg package manager to install the dependencies (`vcpkg.json`). It's included as a submodule in the project. To install the dependencies, run the following commands: .. code:: console @@ -31,12 +31,19 @@ a submodule in the project. To install the dependencies, run the following comma vcpkg/vcpkg install +Copy the ``grpc-cpp-plugin`` to the build directory (TODO: This should ideally be done automatically by CMake): + +.. code:: console + + mkdir -p build/build_tools + cp vcpkg_installed/<os>/tools/grpc/grpc_cpp_plugin build/build_tools + Then compile the project with CMake by including the vcpkg toolchain file: .. code:: console cd build - cmake -S .. -B . -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-linux + cmake -S .. -B . -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-linux -DCMAKE_BUILD_TYPE=Release cmake --build . @@ -49,7 +56,7 @@ package manager. The compiler must support the C++17 standard. 1. clone/update the subrepo ``git submodule update --init proto`` 2. ``conan install . -s build_type=Release --build=missing`` 3. ``cd build/Release`` -4. ``cmake .`` +4. ``cmake -S ../.. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=Release`` 5. ``cmake --build .`` You may also want to install libcaosdb system-wide to diff --git a/vcpkg.json b/vcpkg.json index 451b02eb4b88f9bbed70a11c496e3f959a36fb30..aacd5114894705800dbc0b6d6aa2a9a462f1cfda 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -5,12 +5,7 @@ "description": "C++ library for the CaosDB project", "license": "AGPL-3.0-or-later", "dependencies": [ - "boost-beast", - "boost-filesystem", - "boost-json", - "boost-log", - "boost-smart-ptr", - "boost-thread", + "boost", "grpc", "protobuf", "zlib",