shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[flang][CMake] Remove BACKEND_PACKAGE_STRING

Browse Source 
Similar to D136660
This commit is contained in:
Fangrui Song 2022-10-25 21:57:19 -07:00
parent 1464e30704
commit 3a0b6101c6
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flang/CMakeLists.txt
View File

@ -133,7 +133,6 @@ if (FLANG_STANDALONE_BUILD)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) ${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") set(LLVM_EXTERNAL_LIT "${LLVM_TOOLS_BINARY_DIR}/llvm-lit" CACHE STRING "Command used to spawn lit")
option(FLANG_INCLUDE_TESTS option(FLANG_INCLUDE_TESTS
@ -195,7 +194,6 @@ else()
set(FLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(FLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
endif() endif()
set(BACKEND_PACKAGE_STRING "${PACKAGE_STRING}")
set(MLIR_MAIN_SRC_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include ) # --src-root 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_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include ) # --includedir
set(MLIR_TABLEGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/tools/mlir/include) set(MLIR_TABLEGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/tools/mlir/include)

2
flang/cmake/modules/AddFlang.cmake
View File

@ -7,7 +7,7 @@ macro(set_flang_windows_version_resource_properties name)
VERSION_MAJOR ${FLANG_VERSION_MAJOR} VERSION_MAJOR ${FLANG_VERSION_MAJOR}
VERSION_MINOR ${FLANG_VERSION_MINOR} VERSION_MINOR ${FLANG_VERSION_MINOR}
VERSION_PATCHLEVEL ${FLANG_VERSION_PATCHLEVEL} VERSION_PATCHLEVEL ${FLANG_VERSION_PATCHLEVEL}
VERSION_STRING "${FLANG_VERSION} (${BACKEND_PACKAGE_STRING})" VERSION_STRING "${FLANG_VERSION}"
PRODUCT_NAME "flang") PRODUCT_NAME "flang")
endif() endif()
endmacro() endmacro()