diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-21 23:31:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-21 23:31:07 +0000 |
| commit | 9f074e6b4b64c780d9273f938e6d25b4213adf89 (patch) | |
| tree | a2dd27e169e96b338d530bb423bdeebc3f7b4963 | |
| parent | 74c9b8e5e5b3bcb57da2e37180375b026f71c589 (diff) | |
| parent | 911999a83ea7a754846d68f4b5a32fba4d0a2d56 (diff) | |
| download | webrtc-emu-30-release.tar.gz | |
Merge "Snap for 7453540 from 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 to emu-30-release" into emu-30-releaseemu-30-release
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | third_party/abseil-cpp/CMake/AbseilHelpers.cmake | 2 | ||||
| -rw-r--r-- | third_party/abseil-cpp/CMakeLists.txt | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5add1bc1e9..b25464297e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ if(${CMAKE_VERSION} VERSION_LESS "3.18.0") COMMAND unzip -n "${WEBRTC_ROOT}/test_resources.zip" -d ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${WEBRTC_ROOT}) else() - file(ARCHIVE_EXTRACT INPUT test_resources.zip DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + file(ARCHIVE_EXTRACT INPUT ${WEBRTC_ROOT}/test_resources.zip DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) endif() add_library( diff --git a/third_party/abseil-cpp/CMake/AbseilHelpers.cmake b/third_party/abseil-cpp/CMake/AbseilHelpers.cmake index 1541435d5f..8502c02c9a 100644 --- a/third_party/abseil-cpp/CMake/AbseilHelpers.cmake +++ b/third_party/abseil-cpp/CMake/AbseilHelpers.cmake @@ -142,7 +142,7 @@ function(absl_cc_library) endif() # Generate a pkg-config file for every library: - if(_build_type STREQUAL "static" OR _build_type STREQUAL "shared") + if((_build_type STREQUAL "static" OR _build_type STREQUAL "shared") AND ABSL_ENABLE_INSTALL) if(NOT ABSL_CC_LIB_TESTONLY) if(absl_VERSION) set(PC_VERSION "${absl_VERSION}") diff --git a/third_party/abseil-cpp/CMakeLists.txt b/third_party/abseil-cpp/CMakeLists.txt index 8843ee7918..e68810e3cf 100644 --- a/third_party/abseil-cpp/CMakeLists.txt +++ b/third_party/abseil-cpp/CMakeLists.txt @@ -144,6 +144,7 @@ endif() add_subdirectory(absl) if(ABSL_ENABLE_INSTALL) + message(FATAL_ERROR "Please do not install abseil") # absl:lts-remove-begin(system installation is supported for LTS releases) # We don't support system-wide installation list(APPEND SYSTEM_INSTALL_DIRS "/usr/local" "/usr" "/opt/" "/opt/local" "c:/Program Files/${PROJECT_NAME}") |