Skip to content

Commit 1093af3

Browse files
committed
Undo version number changes.
1 parent 2dcc618 commit 1093af3

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

cmake/Modules/LLVMVersion.cmake

Lines changed: 0 additions & 15 deletions
This file was deleted.

llvm/CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,18 @@ if(NOT LLVM_NO_INSTALL_NAME_DIR_FOR_BUILD_TREE)
1515
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
1616
endif()
1717

18-
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/LLVMVersion.cmake)
18+
if(NOT DEFINED LLVM_VERSION_MAJOR)
19+
set(LLVM_VERSION_MAJOR 19)
20+
endif()
21+
if(NOT DEFINED LLVM_VERSION_MINOR)
22+
set(LLVM_VERSION_MINOR 0)
23+
endif()
24+
if(NOT DEFINED LLVM_VERSION_PATCH)
25+
set(LLVM_VERSION_PATCH 0)
26+
endif()
27+
if(NOT DEFINED LLVM_VERSION_SUFFIX)
28+
set(LLVM_VERSION_SUFFIX git)
29+
endif()
1930

2031
set_directory_properties(PROPERTIES LLVM_VERSION_MAJOR "${LLVM_VERSION_MAJOR}")
2132

runtimes/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
66
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
77
NO_POLICY_SCOPE)
88

9-
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/LLVMVersion.cmake)
10-
119
project(Runtimes C CXX ASM)
1210

1311
list(INSERT CMAKE_MODULE_PATH 0

0 commit comments

Comments
 (0)