llvm.org GIT mirror llvm / c0e7d7e
[CMake]Use LLVM_LIBRARY_DIR for lib path. Summary: This makes sure the correct lib path is being used when `CMAKE_CFG_INTDIR` or `LLVM_LIBDIR_SUFFIX` is set. Reviewers: beanz Subscribers: mgorny, srhines, pirama, llvm-commits Differential Revision: https://reviews.llvm.org/D35318 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307985 91177308-0d34-0410-b5e6-96231b3b80d8 Leo Li 3 years ago
1 changed file(s) with 5 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all
2929 list(INSERT CMAKE_MODULE_PATH 0
3030 "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
3131 "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules"
32 "${LLVM_BINARY_DIR}/lib/cmake/llvm"
32 "${LLVM_LIBRARY_DIR}/cmake/llvm"
3333 )
3434
3535 # Some of the runtimes will conditionally use the compiler-rt sanitizers
122122 set(LLVM_RUNTIME_OUTPUT_INTDIR "${LLVM_TOOLS_BINARY_DIR}/${LLVM_RUNTIMES_TARGET}")
123123 endif()
124124 endif()
125
125
126126 # Between each sub-project we want to cache and clear the LIT properties
127127 set_property(GLOBAL PROPERTY LLVM_LIT_TESTSUITES)
128128 set_property(GLOBAL PROPERTY LLVM_LIT_PARAMS)
153153 if(LLVM_INCLUDE_TESTS)
154154 # Add a global check rule now that all subdirectories have been traversed
155155 # and we know the total set of lit testsuites.
156
156
157157 add_lit_target(check-runtimes
158158 "Running all regression tests"
159159 ${RUNTIMES_LIT_TESTSUITES}
330330 # Builtins were built separately above
331331 CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
332332 -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
333 -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
333334 -DCMAKE_C_COMPILER_TARGET=${target}
334335 -DCMAKE_CXX_COMPILER_TARGET=${target}
335336 -DCMAKE_ASM_COMPILER_TARGET=${target}
375376 # Builtins were built separately above
376377 CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
377378 -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
379 -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
378380 PASSTHROUGH_PREFIXES ${prefixes}
379381 EXTRA_TARGETS ${extra_targets}
380382 ${test_targets}