This is an archive of the discontinued LLVM Phabricator instance.

Differential D50738

Remove vestiges of configure buildsystem
ClosedPublic

Authored by steveire on Aug 14 2018, 2:31 PM.

Details

Reviewers
chapuni
dblaikie
beanz
Commits
rGa21cc1f5df9f: Remove vestiges of configure buildsystem
rC341146: Remove vestiges of configure buildsystem
rL341146: Remove vestiges of configure buildsystem
Summary

Remove also the condition to allow in-source builds when using MSVC_IDE.
This may be vestigial and date from a time when llvm CMakeLists.txt had
a similar condition. The llvm file does not have such a condition, so
this brings them in sync.

Diff Detail

Event Timeline

steveire created this revision.Aug 14 2018, 2:31 PM
Herald added subscribers: cfe-commits, mgorny. · View Herald TranscriptAug 14 2018, 2:31 PM
steveire added reviewers: chapuni, dblaikie.Aug 15 2018, 12:41 PM
steveire added a reviewer: beanz.Aug 15 2018, 1:07 PM
svenvh added a subscriber: svenvh.Aug 23 2018, 4:51 AM
svenvh added inline comments.
CMakeLists.txt
288

The NOT MSVC_IDE condition is still present in llvm's CMakeLists.txt, at least in r340526 (line 230), so not sure if we should remove it here?

steveire updated this revision to Diff 162283.Aug 23 2018, 3:40 PM

Remove vestiges of configure buildsystem

Harbormaster completed remote builds in B21853: Diff 162283.Aug 23 2018, 3:40 PM
steveire marked an inline comment as done.Aug 23 2018, 3:41 PM
This revision was not accepted when it landed; it landed in state Needs Review.Aug 30 2018, 4:42 PM
Closed by commit rL341146: Remove vestiges of configure buildsystem (authored by steveire). · Explain Why
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptAug 30 2018, 4:42 PM

Revision Contents

PathSize
18 lines

Diff 160692

CMakeLists.txt

Show First 20 Lines • Show All 279 Lines • ▼ Show 20 Linesset(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING
"Vendor-specific uti.") "Vendor-specific uti.")
# The libdir suffix must exactly match whatever LLVM's configuration used. # The libdir suffix must exactly match whatever LLVM's configuration used.
set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}") set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}")
set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE ) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
svenvhUnsubmitted
Done
ReplyInline Actions

The NOT MSVC_IDE condition is still present in llvm's CMakeLists.txt, at least in r340526 (line 230), so not sure if we should remove it here?

svenvh: The `NOT MSVC_IDE` condition is still present in llvm's `CMakeLists.txt`, at least in r340526…
message(FATAL_ERROR "In-source builds are not allowed. CMake would overwrite " message(FATAL_ERROR "In-source builds are not allowed. "
"the makefiles distributed with LLVM. Please create a directory and run cmake " "Please create a directory and run cmake "
"from there, passing the path to this source directory as the last argument. " "from there, passing the path to this source directory as the last argument. "
"This process created the file `CMakeCache.txt' and the directory " "This process created the file `CMakeCache.txt' and the directory "
"`CMakeFiles'. Please delete them.") "`CMakeFiles'. Please delete them.")
endif() endif()
if( NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
file(GLOB_RECURSE
tablegenned_files_on_include_dir
"${CLANG_SOURCE_DIR}/include/clang/*.inc")
if( tablegenned_files_on_include_dir )
message(FATAL_ERROR "Apparently there is a previous in-source build, "
"probably as the result of running `configure' and `make' on "
"${CLANG_SOURCE_DIR}. This may cause problems. The suspicious files are:\n"
"${tablegenned_files_on_include_dir}\nPlease clean the source directory.")
endif()
endif()
# If CLANG_VERSION_* is specified, use it, if not use LLVM_VERSION_*. # If CLANG_VERSION_* is specified, use it, if not use LLVM_VERSION_*.
if(NOT DEFINED CLANG_VERSION_MAJOR) if(NOT DEFINED CLANG_VERSION_MAJOR)
set(CLANG_VERSION_MAJOR ${LLVM_VERSION_MAJOR}) set(CLANG_VERSION_MAJOR ${LLVM_VERSION_MAJOR})
endif() endif()
if(NOT DEFINED CLANG_VERSION_MINOR) if(NOT DEFINED CLANG_VERSION_MINOR)
set(CLANG_VERSION_MINOR ${LLVM_VERSION_MINOR}) set(CLANG_VERSION_MINOR ${LLVM_VERSION_MINOR})
endif() endif()
if(NOT DEFINED CLANG_VERSION_PATCHLEVEL) if(NOT DEFINED CLANG_VERSION_PATCHLEVEL)
▲ Show 20 Lines • Show All 450 Lines • Show Last 20 Lines