[flang-commits] [flang] 3a0b610 - [flang][CMake] Remove BACKEND_PACKAGE_STRING
Fangrui Song via flang-commits
flang-commits at lists.llvm.org
Tue Oct 25 21:57:33 PDT 2022
Author: Fangrui Song
Date: 2022-10-25T21:57:20-07:00
New Revision: 3a0b6101c68928ada6c1220a8521eff41491f6a5
URL: https://github.com/llvm/llvm-project/commit/3a0b6101c68928ada6c1220a8521eff41491f6a5
DIFF: https://github.com/llvm/llvm-project/commit/3a0b6101c68928ada6c1220a8521eff41491f6a5.diff
LOG: [flang][CMake] Remove BACKEND_PACKAGE_STRING
Similar to D136660
Added:
Modified:
flang/CMakeLists.txt
flang/cmake/modules/AddFlang.cmake
Removed:
################################################################################
diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt
index a0bf269610ce..27cb22ba0e38 100644
--- a/flang/CMakeLists.txt
+++ b/flang/CMakeLists.txt
@@ -133,7 +133,6 @@ if (FLANG_STANDALONE_BUILD)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
- set(BACKEND_PACKAGE_STRING "LLVM ${LLVM_PACKAGE_VERSION}")
set(LLVM_EXTERNAL_LIT "${LLVM_TOOLS_BINARY_DIR}/llvm-lit" CACHE STRING "Command used to spawn lit")
option(FLANG_INCLUDE_TESTS
@@ -195,7 +194,6 @@ else()
set(FLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
endif()
- set(BACKEND_PACKAGE_STRING "${PACKAGE_STRING}")
set(MLIR_MAIN_SRC_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include ) # --src-root
set(MLIR_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include ) # --includedir
set(MLIR_TABLEGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/tools/mlir/include)
diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
index d516ca31b51f..c54c30dbf6df 100644
--- a/flang/cmake/modules/AddFlang.cmake
+++ b/flang/cmake/modules/AddFlang.cmake
@@ -7,7 +7,7 @@ macro(set_flang_windows_version_resource_properties name)
VERSION_MAJOR ${FLANG_VERSION_MAJOR}
VERSION_MINOR ${FLANG_VERSION_MINOR}
VERSION_PATCHLEVEL ${FLANG_VERSION_PATCHLEVEL}
- VERSION_STRING "${FLANG_VERSION} (${BACKEND_PACKAGE_STRING})"
+ VERSION_STRING "${FLANG_VERSION}"
PRODUCT_NAME "flang")
endif()
endmacro()
More information about the flang-commits
mailing list