diff options
| author | Brian Gesiak <modocache@gmail.com> | 2017-09-29 19:50:41 +0000 |
|---|---|---|
| committer | Brian Gesiak <modocache@gmail.com> | 2017-09-29 19:50:41 +0000 |
| commit | 615a3bbdad3dce0b2594825abb74dfdd3f6e7536 (patch) | |
| tree | 3852989f58b16c978ba4a94a20238a87dfc9d1ae | |
| parent | cccbed8450e1ca106da2a02e0f6ea675544b4c01 (diff) | |
| download | bcm5719-llvm-615a3bbdad3dce0b2594825abb74dfdd3f6e7536.tar.gz bcm5719-llvm-615a3bbdad3dce0b2594825abb74dfdd3f6e7536.zip | |
Revert "[CMake] Remove `CMAKE_.*_OUTPUT_DIRECTORY` (NFCI)"
Summary:
It appears polly makes use of the `CMAKE_RUNTIME_OUTPUT_DIRECTORY` variable
when configuring its lit test suite. Reverting this for now.
llvm-svn: 314551
| -rw-r--r-- | llvm/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 2b41d99dc6b..3e2e548df3f 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -761,6 +761,12 @@ add_custom_target(srpm COMMAND cpack -G TGZ --config CPackSourceConfig.cmake -B ${LLVM_SRPM_DIR}/SOURCES COMMAND rpmbuild -bs --define '_topdir ${LLVM_SRPM_DIR}' ${LLVM_SRPM_BINARY_SPECFILE}) + +# They are not referenced. See set_output_directory(). +set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) +set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) + if(APPLE AND DARWIN_LTO_LIBRARY) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-lto_library -Wl,${DARWIN_LTO_LIBRARY}") diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 64ef479f30b..81e7211ef97 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -214,6 +214,8 @@ function(add_link_opts target_name) endfunction(add_link_opts) # Set each output directory according to ${CMAKE_CONFIGURATION_TYPES}. +# Note: Don't set variables CMAKE_*_OUTPUT_DIRECTORY any more, +# or a certain builder, for eaxample, msbuild.exe, would be confused. function(set_output_directory target) cmake_parse_arguments(ARG "" "BINARY_DIR;LIBRARY_DIR" "" ${ARGN}) |
