From 5f4da9324a3d3f3c3348e66452607ac3d15495ff Mon Sep 17 00:00:00 2001 From: Strahinja Val Markovic Date: Thu, 5 Jul 2012 17:58:49 -0700 Subject: [PATCH] Adding llvm/clang to our CMakeLists files The indexer target now depends on libclang. This will force cmake to build the required parts of llvm and clang. --- cpp/CMakeLists.txt | 1 + cpp/ycm/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 94240c6a..7991b7bc 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -34,5 +34,6 @@ if( NOT CMAKE_BUILD_TYPE ) set( CMAKE_BUILD_TYPE RELEASE ) endif() +add_subdirectory( llvm ) add_subdirectory( BoostParts ) add_subdirectory( ycm ) diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt index e12327ff..c146de95 100644 --- a/cpp/ycm/CMakeLists.txt +++ b/cpp/ycm/CMakeLists.txt @@ -33,6 +33,8 @@ include_directories( SYSTEM ${BoostParts_SOURCE_DIR} ${PYTHON_INCLUDE_DIRS} + "${LLVM_SOURCE_DIR}/include" + "${LLVM_SOURCE_DIR}/tools/clang/include" ) file( GLOB_RECURSE SOURCES *.h *.cpp ) @@ -55,6 +57,7 @@ add_library( ${PROJECT_NAME} SHARED target_link_libraries( ${PROJECT_NAME} BoostParts ${PYTHON_LIBRARIES} + libclang_static ) #############################################################################