diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-01-19 13:00:01 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-01-19 13:00:01 +0000 |
| commit | fc63dd2eb33dbfa50aaa9089a681235249273757 (patch) | |
| tree | 1b71f8b0359d6acde5af4909009ff43c69166854 /CMakeLists.txt | |
| parent | 16b0e2ba7982da8c4bba52891002db6279f11e9d (diff) | |
| download | clang-fc63dd2eb33dbfa50aaa9089a681235249273757.tar.gz clang-fc63dd2eb33dbfa50aaa9089a681235249273757.tar.bz2 clang-fc63dd2eb33dbfa50aaa9089a681235249273757.tar.xz | |
[CMake] Deprecate CLANG_RUNTIME_OUTPUT_INTDIR and CLANG_LIBRARY_OUTPUT_INTDIR.
LLVM_*_OUTPUT_INTDIR should be available everywhere. It was my mistake when I introduced INTDIR stuff.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199597 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a93b475b5b..3851f6a6a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,9 +178,6 @@ set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) -set(CLANG_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) -set(CLANG_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE ) message(FATAL_ERROR "In-source builds are not allowed. CMake would overwrite " "the makefiles distributed with LLVM. Please create a directory and run cmake " @@ -310,7 +307,7 @@ macro(add_clang_library name) endif() add_library( ${name} ${libkind} ${srcs} ) add_dead_strip( ${name} ) - set_output_directory(${name} ${CLANG_RUNTIME_OUTPUT_INTDIR} ${CLANG_LIBRARY_OUTPUT_INTDIR}) + set_output_directory(${name} ${LLVM_RUNTIME_OUTPUT_INTDIR} ${LLVM_LIBRARY_OUTPUT_INTDIR}) if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) endif( LLVM_COMMON_DEPENDS ) @@ -340,7 +337,6 @@ endmacro(add_clang_library) macro(add_clang_executable name) add_llvm_executable( ${name} ${ARGN} ) set_target_properties(${name} PROPERTIES FOLDER "Clang executables") - set_output_directory(${name} ${CLANG_RUNTIME_OUTPUT_INTDIR} ${CLANG_LIBRARY_OUTPUT_INTDIR}) endmacro(add_clang_executable) include_directories(BEFORE |