Dev: update cmake in corelibs script

readdle · Nov 16, 2023 · 99d37ed · 99d37ed
1 parent 457c93f
commit 99d37ed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/build/Linux/052-build-corelibs.sh b/build/Linux/052-build-corelibs.sh
@@ -12,6 +12,18 @@ function finish {
 }
 trap finish EXIT
 
+# Install fresh version of CMake
+apt remove --purge --auto-remove -y cmake
+version=3.27
+build=7
+mkdir ~/temp
+cd ~/temp
+wget https://cmake.org/files/v$version/cmake-$version.$build-linux-x86_64.sh 
+mkdir /opt/cmake
+sh cmake-$version.$build-linux-x86_64.sh --prefix=/opt/cmake --skip-license
+ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+cmake --version
+
 self_dir=$(realpath $(dirname $0))
 
 arch=$1 # arm64 arm x86 x86_64
@@ -47,7 +59,7 @@ pushd $dispatch_build_dir
         \
         -DENABLE_SWIFT=YES 
 
-    cmake --build $dispatch_build_dir
+    cmake --build $dispatch_build_dir --verbose
 popd
 
 pushd $foundation_build_dir

diff --git a/build/Linux/common-flags.cmake b/build/Linux/common-flags.cmake
@@ -4,6 +4,7 @@ set(CMAKE_Swift_SDK "$ENV{DST_ROOT}/swift-nightly-install" CACHE STRING "")
 set(CMAKE_Swift_COMPILER "$ENV{DST_ROOT}/swift-nightly-install/usr/bin/swiftc" CACHE STRING "")
 
 set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "")
+set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_INSTALL_PREFIX "$ENV{DST_ROOT}/swift-nightly-install/usr" CACHE STRING "")
 
 set(ANDROID_NATIVE_API_LEVEL "24" CACHE STRING "")