RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-23 03:39:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[CMake]Use LLVM_LIBRARY_DIR for lib path.

Browse Source 
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
This commit is contained in:
Leo Li 2017-07-14 00:35:21 +00:00
parent ac4ebc9acc
commit c0e7d7e6da
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtimes/CMakeLists.txt
View File

@ -30,7 +30,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
list(INSERT CMAKE_MODULE_PATH 0 list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake" "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules" "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules"
"${LLVM_BINARY_DIR}/lib/cmake/llvm" "${LLVM_LIBRARY_DIR}/cmake/llvm"
) )
# Some of the runtimes will conditionally use the compiler-rt sanitizers # Some of the runtimes will conditionally use the compiler-rt sanitizers
@ -123,7 +123,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
set(LLVM_RUNTIME_OUTPUT_INTDIR "${LLVM_TOOLS_BINARY_DIR}/${LLVM_RUNTIMES_TARGET}") set(LLVM_RUNTIME_OUTPUT_INTDIR "${LLVM_TOOLS_BINARY_DIR}/${LLVM_RUNTIMES_TARGET}")
endif() endif()
endif() endif()
# Between each sub-project we want to cache and clear the LIT properties # Between each sub-project we want to cache and clear the LIT properties
set_property(GLOBAL PROPERTY LLVM_LIT_TESTSUITES) set_property(GLOBAL PROPERTY LLVM_LIT_TESTSUITES)
set_property(GLOBAL PROPERTY LLVM_LIT_PARAMS) set_property(GLOBAL PROPERTY LLVM_LIT_PARAMS)
@ -154,7 +154,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
if(LLVM_INCLUDE_TESTS) if(LLVM_INCLUDE_TESTS)
# Add a global check rule now that all subdirectories have been traversed # Add a global check rule now that all subdirectories have been traversed
# and we know the total set of lit testsuites. # and we know the total set of lit testsuites.
add_lit_target(check-runtimes add_lit_target(check-runtimes
"Running all regression tests" "Running all regression tests"
${RUNTIMES_LIT_TESTSUITES} ${RUNTIMES_LIT_TESTSUITES}
@ -331,6 +331,7 @@ else() # if this is included from LLVM's CMake
# Builtins were built separately above # Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
-DCMAKE_C_COMPILER_TARGET=${target} -DCMAKE_C_COMPILER_TARGET=${target}
-DCMAKE_CXX_COMPILER_TARGET=${target} -DCMAKE_CXX_COMPILER_TARGET=${target}
-DCMAKE_ASM_COMPILER_TARGET=${target} -DCMAKE_ASM_COMPILER_TARGET=${target}
@ -376,6 +377,7 @@ else() # if this is included from LLVM's CMake
# Builtins were built separately above # Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
PASSTHROUGH_PREFIXES ${prefixes} PASSTHROUGH_PREFIXES ${prefixes}
EXTRA_TARGETS ${extra_targets} EXTRA_TARGETS ${extra_targets}
${test_targets} ${test_targets}