jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to cmake 3.10.2

Browse Source 
Summary: This was recommended by my Android Studio 3.3 when starting up, so let's do this.

Reviewed By: jknoxville

Differential Revision: D13302768

fbshipit-source-id: c38601659bde4515d62b31efbd907b44304aafba
This commit is contained in:
Pascal Hartig
2018-12-05 15:44:04 -08:00
committed by Facebook Github Bot
parent dfd2e279bc
commit 03b5306459
7 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/build.gradle
View File

@@ -16,6 +16,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version CMAKE_VERSION
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared' arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared'
targets 'flipper', 'event', 'event_extra', 'event_core' targets 'flipper', 'event', 'event_extra', 'event_core'
} }

1
android/third-party/overrides/DoubleConversion/build.gradle vendored
View File

@@ -24,6 +24,7 @@ android {
} }
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version CMAKE_VERSION
path './CMakeLists.txt' path './CMakeLists.txt'
} }
} }

1
android/third-party/overrides/Folly/build.gradle vendored
View File

@@ -25,6 +25,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path './CMakeLists.txt' path './CMakeLists.txt'
version CMAKE_VERSION
} }
} }

1
android/third-party/overrides/LibEvent/build.gradle vendored
View File

@@ -24,6 +24,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path 'libevent-release-2.1.9/CMakeLists.txt' path 'libevent-release-2.1.9/CMakeLists.txt'
version CMAKE_VERSION
} }
} }
} }

2
android/third-party/overrides/RSocket/build.gradle vendored
View File

@@ -24,7 +24,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path './CMakeLists.txt' path './CMakeLists.txt'
version CMAKE_VERSION
} }
} }
} }
//'x86', 'x86_64', 'armeabi-v7a',

1
android/third-party/overrides/glog/build.gradle vendored
View File

@@ -25,6 +25,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path './CMakeLists.txt' path './CMakeLists.txt'
version CMAKE_VERSION
} }
} }
} }

2
gradle.properties
View File

@@ -14,6 +14,8 @@ POM_DEVELOPER_NAME=facebook
# Shared version numbers # Shared version numbers
LITHO_VERSION=0.21.0 LITHO_VERSION=0.21.0
CMAKE_VERSION="3.10.2"
# Gradle internals # Gradle internals
org.gradle.internal.repository.max.retries=10 org.gradle.internal.repository.max.retries=10
org.gradle.internal.repository.initial.backoff=1250 org.gradle.internal.repository.initial.backoff=1250