Skip to content

Commit

Permalink
Remove unused SourceManager parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
pukkaone committed Feb 10, 2013
1 parent 8bdbc4b commit 852d360
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 564 deletions.
11 changes: 3 additions & 8 deletions CMakeLists.txt
@@ -1,4 +1,3 @@
# $Id$
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(find-unnecessary-includes) project(find-unnecessary-includes)


Expand All @@ -16,6 +15,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
enable_testing() enable_testing()


# Visual C++ Express Editions do not support solution folders. # Visual C++ Express Editions do not support solution folders.
set(LLVM_USE_FOLDERS OFF)
set_property(GLOBAL PROPERTY USE_FOLDERS OFF) set_property(GLOBAL PROPERTY USE_FOLDERS OFF)


option(USE_INSTALLED_CLANG "Use an installed clang/llvm?" OFF) option(USE_INSTALLED_CLANG "Use an installed clang/llvm?" OFF)
Expand All @@ -29,13 +29,6 @@ if(USE_INSTALLED_CLANG)
set(CLANG_INCLUDE_DIRS) set(CLANG_INCLUDE_DIRS)
link_directories(${LLVM_LIBRARY_DIRS}) link_directories(${LLVM_LIBRARY_DIRS})
else() else()
# Patch LLVM CMake script to set USE_FOLDERS property to OFF.
configure_file(
patch/llvm/CMakeLists.txt
${CMAKE_SOURCE_DIR}/llvm/CMakeLists.txt
COPYONLY)
add_subdirectory(llvm)

set(CLANG_BUILD_STANDALONE 1 set(CLANG_BUILD_STANDALONE 1
CACHE INTERNAL "Build clang as standalone.") CACHE INTERNAL "Build clang as standalone.")
set(CLANG_PATH_TO_LLVM_SOURCE "${CMAKE_SOURCE_DIR}/llvm" set(CLANG_PATH_TO_LLVM_SOURCE "${CMAKE_SOURCE_DIR}/llvm"
Expand All @@ -48,6 +41,8 @@ else()
patch/clang/CMakeLists.txt patch/clang/CMakeLists.txt
${CMAKE_SOURCE_DIR}/clang/CMakeLists.txt ${CMAKE_SOURCE_DIR}/clang/CMakeLists.txt
COPYONLY) COPYONLY)

add_subdirectory(llvm)
add_subdirectory(clang) add_subdirectory(clang)
set(LLVM_INCLUDE_DIRS set(LLVM_INCLUDE_DIRS
${CMAKE_BINARY_DIR}/llvm/include ${CMAKE_BINARY_DIR}/llvm/include
Expand Down
2 changes: 1 addition & 1 deletion clang
Submodule clang updated from e8a979 to 772805
2 changes: 1 addition & 1 deletion llvm
Submodule llvm updated from 95ce4c to 7dcb23
12 changes: 7 additions & 5 deletions patch/clang/CMakeLists.txt
Expand Up @@ -88,7 +88,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE )
"`CMakeFiles'. Please delete them.") "`CMakeFiles'. Please delete them.")
endif() endif()


if( CLANG_BUILD_STANDALONE OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) if( NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
file(GLOB_RECURSE file(GLOB_RECURSE
tablegenned_files_on_include_dir tablegenned_files_on_include_dir
"${CLANG_SOURCE_DIR}/include/clang/*.inc") "${CLANG_SOURCE_DIR}/include/clang/*.inc")
Expand Down Expand Up @@ -266,10 +266,12 @@ add_subdirectory(examples)
# TODO: docs. # TODO: docs.
add_subdirectory(test) add_subdirectory(test)


if( LLVM_INCLUDE_TESTS ) option(CLANG_INCLUDE_TESTS
if( NOT CLANG_BUILT_STANDALONE ) "Generate build targets for the Clang unit tests."
add_subdirectory(unittests) ${LLVM_INCLUDE_TESTS})
endif()
if( CLANG_INCLUDE_TESTS )
add_subdirectory(unittests)
endif() endif()


# Workaround for MSVS10 to avoid the Dialog Hell # Workaround for MSVS10 to avoid the Dialog Hell
Expand Down

0 comments on commit 852d360

Please sign in to comment.