diff options
| author | Tim Barron <tjbarron@google.com> | 2021-05-06 18:14:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-06 18:14:25 +0000 |
| commit | 8df6ca7dd872b8c267013a6f97cf349def1fc5f2 (patch) | |
| tree | a8715724642c3bdc7ae1bb25cabef333a05aa9b5 | |
| parent | 8f8b435d5d313095b682883a7f982bf652dfb663 (diff) | |
| parent | 850ab326b65953830c83f5e84f60faf5bc7b4049 (diff) | |
| download | icing-8df6ca7dd872b8c267013a6f97cf349def1fc5f2.tar.gz | |
Merge "Sync icing CMake file with icu cmake changes" into androidx-platform-dev
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a740924..70f6852 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ add_subdirectory("${Protobuf_SOURCE_DIR}/cmake" ${Protobuf_TARGET_BINARY_DIR}) # Compile libandroidicu set(ICU_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../icu/libandroidicu") set(ICU_TARGET_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/icu-target") -add_subdirectory(${ICU_SOURCE_DIR} ${ICU_TARGET_BINARY_DIR}) +add_subdirectory("${ICU_SOURCE_DIR}/static_shim" ${ICU_TARGET_BINARY_DIR}) # Glob Icing proto sources. Results look like this: icing/proto/document.proto file( |