Skip to content

Commit

Permalink
update cmake to 3.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
wgtdkp committed Apr 15, 2024
1 parent fa0d994 commit 3c80269
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ jobs:
gcc_ver: [5, 6, 7, 8, 9, 10]
steps:
- uses: actions/checkout@v3
- name: Install CMake 3.10.1
- name: Install CMake 3.20.1
run: |
wget https://cmake.org/files/v3.10/cmake-3.10.1.zip
unzip cmake-3.10.1
cd cmake-3.10.1
wget https://cmake.org/files/v3.20/cmake-3.20.1.zip
unzip cmake-3.20.1
cd cmake-3.20.1
cmake .
make -j4
sudo make install
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#

cmake_minimum_required(VERSION 3.10.1)
cmake_minimum_required(VERSION 3.20.1)
project(ot-commissioner VERSION 0.2.0)

option(OT_COMM_ANDROID "Build with Android NDK" OFF)
Expand Down
6 changes: 6 additions & 0 deletions android/build-commissioner-libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ cd "${CUR_DIR}"
readonly BUILD_DIR=".build-$ANDROID_ABI"

mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"

# Sometimes the java binding will not be rebuilt even of commissioner.hpp is updated.
# This will enforce rebuilding of the java binding in case the commissioner API is changed.
# Don't need this when https://github.com/openthread/ot-commissioner/pull/262 is merged
rm -rf src/java

cmake -GNinja \
-DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK_HOME"/build/cmake/android.toolchain.cmake \
-DANDROID_ABI="$ANDROID_ABI" \
Expand Down
2 changes: 1 addition & 1 deletion script/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set -e

# Bootstrap with CCM dependencies.
readonly WITH_CCM="${WITH_CCM:-1}"
readonly MIN_CMAKE_VERSION="3.10.1"
readonly MIN_CMAKE_VERSION="3.20.1"

## Match the version to see if current version is greater than or euqal to required version.
## Args: $1 current version
Expand Down

0 comments on commit 3c80269

Please sign in to comment.