diff --git a/CMakeLists.txt b/CMakeLists.txt index 91c0423ade5bd19d649237dc0a4a14eec0301300..0aae913492bf56c49d81f70f380e54ce950e5184 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. # -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.13) set(libcaosdb_VERSION 0.0.5) set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0) diff --git a/README_SETUP.md b/README_SETUP.md index bcda25acc80f00ef9801357f786d973face177fa..df471a5b9e8aadf7b04dd8727d60662e17b92fbd 100644 --- a/README_SETUP.md +++ b/README_SETUP.md @@ -1,10 +1,16 @@ # How to Develop and Use Libcaosdb -## Build +## Requirements ## + +- conan: `pip install conan` +- cmake >= 3.13 +- (Only necessary when building from the git sources) `git submodule update --init proto` + +## Semi-manual build We use [cmake](https://cmake.org) as build tool. -1. `mkdir build && cd build/` +1. `mkdir build && cd build` 2. `conan install .. -s "compiler.libcxx=libstdc++11"` 3. `cmake -B . ..` 4. `cmake --build .` @@ -29,6 +35,13 @@ have to add `build/lib/` (or, alternatively after installation, `CMAKE_INSTALL_PREFIX/lib`) to your `DYLD_LIBRARY_PATH` environmental variable. +## Building with Conan ## + +Building and installing libcaosdb with Conan is just a single command: +`conan create . -s "compiler.libcxx=libstdc++11"` + +For MacOS, you probably should adjust the option as mentioned above. + ## Unit Tests ### Build