From 5786d2b8541cf95e26e99bd4e6d5d5b094e269c6 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 23 Jun 2021 16:25:06 +0800 Subject: [PATCH] Drop the 'git' suffix from various version variables Upstream-Status: Backport [cherry-picked from branch 12.0.0] Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- libcxx/CMakeLists.txt | 2 +- libcxxabi/CMakeLists.txt | 2 +- libunwind/CMakeLists.txt | 2 +- llvm/CMakeLists.txt | 6 +++--- .../llvm/include/llvm/Config/llvm-config.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index b1e25358d41a..0048f3284ac2 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -27,7 +27,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL project(libcxx CXX C) set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 13.0.0git) + set(PACKAGE_VERSION 13.0.0) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org") diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index 971629d81dbe..a3e25d8e67ca 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -28,7 +28,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_B project(libcxxabi CXX C) set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 11.0.0git) + set(PACKAGE_VERSION 11.0.0) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org") diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 81eddbc24879..8b6811ac648e 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -24,7 +24,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_B project(libunwind LANGUAGES C CXX ASM) set(PACKAGE_NAME libunwind) - set(PACKAGE_VERSION 13.0.0git) + set(PACKAGE_VERSION 13.0.0) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org") diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index af53a26d2d67..052bdb4e7881 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -800,8 +800,8 @@ if (TENSORFLOW_C_LIB_PATH) include_directories(${TENSORFLOW_C_LIB_PATH}/include) if (NOT TF_PROTO_HEADERS) message(STATUS "TF_PROTO_HEADERS not defined. Looking for tensorflow pip package.") - execute_process(COMMAND - ${Python3_EXECUTABLE} "-m" "pip" "show" "tensorflow" + execute_process(COMMAND + ${Python3_EXECUTABLE} "-m" "pip" "show" "tensorflow" OUTPUT_VARIABLE TF_PIP_OUT) if ("${TF_PIP_OUT}" STREQUAL "") message(FATAL ERROR "Tensorflow pip package is also required for 'development' mode (protobuf headers)") @@ -833,7 +833,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") include_directories(${TENSORFLOW_AOT_PATH}/include) add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) - install(TARGETS tf_xla_runtime EXPORT LLVMExports + install(TARGETS tf_xla_runtime EXPORT LLVMExports ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) endif() diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h index ba85df023ae6..f19c22ad13c0 100644 --- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h +++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h @@ -80,7 +80,7 @@ #define LLVM_VERSION_PATCH 0 /* LLVM version string */ -#define LLVM_VERSION_STRING "13.0.0git" +#define LLVM_VERSION_STRING "13.0.0" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON()