From 1788b00279e27453cd9c2b84fb82d67ddda4bf28 Mon Sep 17 00:00:00 2001 From: Roy Lenferink Date: Sat, 23 Sep 2023 18:53:30 +0200 Subject: [PATCH 1/2] Remove explicit 'snap install' since the block is an example for Ubuntu 22.04 --- documents/building/README.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/documents/building/README.md b/documents/building/README.md index fd69669ca..18d3256ed 100644 --- a/documents/building/README.md +++ b/documents/building/README.md @@ -61,16 +61,13 @@ For Ubuntu 22.04, use the following commands: ```bash sudo apt-get install -yq --no-install-recommends \ build-essential \ + cmake \ git \ default-jdk \ python3 \ python3-pip \ ninja-build -#The cmake version for Ubuntu 20 is older than 3.14, -#use snap to install the latest cmake version -snap install cmake - #Install conan pip3 install -U conan ``` @@ -148,6 +145,7 @@ For Ubuntu 22.04, use the following commands: #### get dependencies sudo apt-get install -yq --no-install-recommends \ build-essential \ + cmake \ git \ curl \ uuid-dev \ @@ -160,10 +158,6 @@ sudo apt-get install -yq --no-install-recommends \ libczmq-dev \ libcpputest-dev \ rapidjson-dev - -#The cmake version for Ubuntu 20 is older than 3.14, -#use snap to install the latest cmake version -snap install cmake ``` For OSX systems with brew installed, use the following commands: @@ -244,4 +238,4 @@ cd celix/build cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../libs/pushstreams make -j sudo make install -``` \ No newline at end of file +``` From d6dc00c05e94666069fa242245006a056f81cb10 Mon Sep 17 00:00:00 2001 From: Roy Lenferink Date: Sat, 23 Sep 2023 18:54:01 +0200 Subject: [PATCH 2/2] Fix indentation for OSX code block --- documents/building/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documents/building/README.md b/documents/building/README.md index 18d3256ed..420150cb5 100644 --- a/documents/building/README.md +++ b/documents/building/README.md @@ -162,9 +162,9 @@ sudo apt-get install -yq --no-install-recommends \ For OSX systems with brew installed, use the following commands: ```bash - brew update && \ - brew install lcov libffi libzip czmq rapidjson libxml2 cmake jansson && \ - brew link --force libffi +brew update && \ +brew install lcov libffi libzip czmq rapidjson libxml2 cmake jansson && \ +brew link --force libffi ``` Use CMake and make to build Apache Celix