diff options
| author | Jordan Rose <jordan_rose@apple.com> | 2014-01-02 19:47:45 +0000 |
|---|---|---|
| committer | Jordan Rose <jordan_rose@apple.com> | 2014-01-02 19:47:45 +0000 |
| commit | ecc59f2299693535b480a8805bba52c9d0be5ea8 (patch) | |
| tree | b86a15cadd64ce3d31d4a66dcabb6e7da0450eb9 /cmake | |
| parent | f79b35a0382d64a7850d28122eacafe1209130af (diff) | |
| download | llvm-ecc59f2299693535b480a8805bba52c9d0be5ea8.tar.gz llvm-ecc59f2299693535b480a8805bba52c9d0be5ea8.tar.bz2 llvm-ecc59f2299693535b480a8805bba52c9d0be5ea8.tar.xz | |
[CMake] Add missing set_output_directory after Takumi's change in r198205.
Plugins need to go in build/Debug/lib as well (rather than build/lib/Debug).
Also, fix the SHLIBDIR path for Xcode, which by default includes Xcode build
settings rather than a simple %(build_mode)s parameter.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198344 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/AddLLVM.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 596c8c6dbb..da4873b1fe 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -177,6 +177,7 @@ ${name} ignored.") endif() add_library( ${name} ${libkind} ${ALL_FILES} ) + set_output_directory(${name} ${LLVM_RUNTIME_OUTPUT_INTDIR} ${LLVM_LIBRARY_OUTPUT_INTDIR}) set_target_properties( ${name} PROPERTIES PREFIX "" ) add_dead_strip( ${name} ) @@ -391,7 +392,6 @@ function(configure_lit_site_cfg input output) set(TARGETS_TO_BUILD ${TARGETS_BUILT}) set(SHLIBEXT "${LTDL_SHLIB_EXT}") - set(SHLIBDIR "${LLVM_LIBRARY_OUTPUT_INTDIR}") if(BUILD_SHARED_LIBS) set(LLVM_SHARED_LIBS_ENABLED "1") @@ -419,6 +419,7 @@ function(configure_lit_site_cfg input output) set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR}) string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_LIBS_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} SHLIBDIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED}) set(SHLIBPATH_VAR ${SHLIBPATH_VAR}) |