Skip to content

Commit 949bbd0

Browse files
Ericson2314Ericson2314
committed
[CMake] Use LLVM_COMMON_CMAKE_UTILS in runtimes just for clarity
In D116472 we created conditionally defined variables for the tools to unbreak the legacy build where they are in `llvm/tools`. The runtimes are not tools, so that flexibility doesn't matter. Still, it might be nice to define (unconditionally) and use the variable for the runtimes simply to make the code a bit clearer and document what is going on. Also, consistently put project dirs at the beginning, not end of `CMAKE_MODULE_PATH`. This ensures they will properly shadow similarly named stuff that happens to be later on the path. Reviewed By: mstorsjo, #libunwind, #libc, #libc_abi, ldionne Differential Revision: https://reviews.llvm.org/D116477
1 parent a361320 commit 949bbd0

File tree

6 files changed

+35
-20
lines changed

6 files changed

+35
-20
lines changed

‎compiler-rt/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE
1212
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1313
endif()
1414

15+
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
16+
1517
# Add path for custom compiler-rt modules.
1618
list(INSERT CMAKE_MODULE_PATH 0
1719
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
1820
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
19-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
20-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
21+
"${LLVM_COMMON_CMAKE_UTILS}"
22+
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
2123
)
2224

2325
if(CMAKE_CONFIGURATION_TYPES)

‎compiler-rt/lib/builtins/CMakeLists.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,19 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
99
project(CompilerRTBuiltins C ASM)
1010
set(COMPILER_RT_STANDALONE_BUILD TRUE)
1111
set(COMPILER_RT_BUILTINS_STANDALONE_BUILD TRUE)
12+
13+
set(COMPILER_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
14+
15+
set(LLVM_COMMON_CMAKE_UTILS "${COMPILER_RT_SOURCE_DIR}/../cmake")
16+
17+
# Add path for custom modules
1218
list(INSERT CMAKE_MODULE_PATH 0
13-
"${CMAKE_SOURCE_DIR}/../../cmake"
14-
"${CMAKE_SOURCE_DIR}/../../cmake/Modules"
15-
"${CMAKE_SOURCE_DIR}/../../../cmake"
16-
"${CMAKE_SOURCE_DIR}/../../../cmake/Modules")
19+
"${COMPILER_RT_SOURCE_DIR}/cmake"
20+
"${COMPILER_RT_SOURCE_DIR}/cmake/Modules"
21+
"${LLVM_COMMON_CMAKE_UTILS}"
22+
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
23+
)
24+
1725
include(base-config-ix)
1826
include(CompilerRTUtils)
1927

‎libcxx/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ endif()
1010
#===============================================================================
1111
cmake_minimum_required(VERSION 3.13.4)
1212

13+
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
14+
1315
# Add path for custom modules
14-
set(CMAKE_MODULE_PATH
16+
list(INSERT CMAKE_MODULE_PATH 0
1517
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
1618
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
17-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
18-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
19-
${CMAKE_MODULE_PATH}
19+
"${LLVM_COMMON_CMAKE_UTILS}"
20+
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
2021
)
2122

2223
set(CMAKE_FOLDER "libc++")

‎libcxxabi/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ endif()
1010

1111
cmake_minimum_required(VERSION 3.13.4)
1212

13+
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
14+
1315
# Add path for custom modules
14-
set(CMAKE_MODULE_PATH
16+
list(INSERT CMAKE_MODULE_PATH 0
1517
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
1618
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
17-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
18-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
19-
${CMAKE_MODULE_PATH}
19+
"${LLVM_COMMON_CMAKE_UTILS}"
20+
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
2021
)
2122

2223
set(CMAKE_FOLDER "libc++")

‎libunwind/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ endif()
88

99
cmake_minimum_required(VERSION 3.13.4)
1010

11+
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
12+
1113
# Add path for custom modules
12-
set(CMAKE_MODULE_PATH
14+
list(INSERT CMAKE_MODULE_PATH 0
1315
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
1416
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
15-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
16-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
17-
${CMAKE_MODULE_PATH}
17+
"${LLVM_COMMON_CMAKE_UTILS}"
18+
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
1819
)
1920

2021
set(LIBUNWIND_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

‎runtimes/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ endfunction()
2828
find_package(LLVM PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
2929
find_package(Clang PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
3030

31+
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
32+
3133
# Add path for custom and the LLVM build's modules to the CMake module path.
3234
list(INSERT CMAKE_MODULE_PATH 0
3335
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
3436
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
35-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
36-
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
37+
"${LLVM_COMMON_CMAKE_UTILS}"
38+
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
3739
"${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake"
3840
"${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake/modules"
3941
)

0 commit comments

Comments
 (0)