NO_CLANG_COMPLETER inverted to USE_CLANG_COMPLETER

cpp/CMakeLists.txt

@@ -18,16 +18,19 @@
 cmake_minimum_required( VERSION 2.8 )
 project( YouCompleteMe )
 
+option( UNIVERSAL "Build universal mac binary" OFF )
+
 # This is needed so that on macs, the library is built in both 32 bit and 64 bit
 # versions. Without this python might refuse to load the module, depending on
 # how python was built.
 # On Mac, boost needs to be compiled universal as well, if used instead of the
 # included BoostParts lib. For brew, that's
 # "brew install boost --universal"
-# If the user chose to use the system libclang.dylib on a mac, then we don't
+# If the user chose to use the system libclang.dylib (or the libclang.dylib
-# specify universal binary building since the system libclang on macs is not
+# binary downloaded from llvm.org) on a mac, then we don't specify universal
-# universal (and thus linking would fail with universal).
+# binary building since the system libclang on macs is not  universal (and thus
-if ( NOT USE_SYSTEM_LIBCLANG )
+# linking would fail with universal).
+if ( UNIVERSAL AND NOT USE_SYSTEM_LIBCLANG )
   set( CMAKE_OSX_ARCHITECTURES "i386;x86_64" )
 endif()
 
@@ -74,7 +77,9 @@ else()
     "Your C++ compiler does NOT support C++11, compiling in C++03 mode." )
 endif()
 
-if ( NOT NO_CLANG_COMPLETER AND
+option( USE_CLANG_COMPLETER "Use Clang semantic completer for C/C++/ObjC" OFF )
+
+if ( USE_CLANG_COMPLETER AND
      ( NOT EXTERNAL_LIBCLANG_PATH AND NOT USE_SYSTEM_LIBCLANG ) )
   add_subdirectory( llvm )
 endif()

cpp/ycm/CMakeLists.txt

@@ -51,18 +51,17 @@ if( to_remove )
   list( REMOVE_ITEM SOURCES ${to_remove} )
 endif()
 
-if ( NO_CLANG_COMPLETER )
+if ( USE_CLANG_COMPLETER )
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    "${CMAKE_CURRENT_SOURCE_DIR}/ClangCompleter" )
+  add_definitions( -DUSE_CLANG_COMPLETER )
+else()
   file( GLOB_RECURSE to_remove_clang ClangCompleter/*.h ClangCompleter/*.cpp )
 
   if( to_remove_clang )
     list( REMOVE_ITEM SOURCES ${to_remove_clang} )
   endif()
-
-  add_definitions( -DNO_CLANG_COMPLETER )
-else()
-  include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    "${CMAKE_CURRENT_SOURCE_DIR}/ClangCompleter" )
 endif()
 
 #############################################################################
@@ -89,7 +88,7 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG )
   set( LIBCLANG_TARGET ${EXTERNAL_LIBCLANG_PATH} )
   message(
     "Using external libclang: ${EXTERNAL_LIBCLANG_PATH}" )
-elseif( NOT NO_CLANG_COMPLETER )
+elseif( USE_CLANG_COMPLETER )
   set( LIBCLANG_TARGET libclang_static )
 else()
   set( LIBCLANG_TARGET )

cpp/ycm/CandidateRepository.cpp

@@ -22,9 +22,9 @@
 
 #include <boost/thread/locks.hpp>
 
-#ifndef NO_CLANG_COMPLETER
+#ifdef USE_CLANG_COMPLETER
 #  include "CompletionData.h"
-#endif // NO_CLANG_COMPLETER
+#endif // USE_CLANG_COMPLETER
 
 namespace YouCompleteMe
 {
@@ -77,7 +77,7 @@ std::vector< const Candidate* > CandidateRepository::GetCandidatesForStrings(
   return candidates;
 }
 
-#ifndef NO_CLANG_COMPLETER
+#ifdef USE_CLANG_COMPLETER
 
 std::vector< const Candidate* > CandidateRepository::GetCandidatesForStrings(
     const std::vector< CompletionData > &datas )
@@ -103,7 +103,7 @@ std::vector< const Candidate* > CandidateRepository::GetCandidatesForStrings(
   return candidates;
 }
 
-#endif // NO_CLANG_COMPLETER
+#endif // USE_CLANG_COMPLETER
 
 CandidateRepository::~CandidateRepository()
 {

cpp/ycm/CandidateRepository.h

@@ -44,10 +44,10 @@ public:
   std::vector< const Candidate* > GetCandidatesForStrings(
       const std::vector< std::string > &strings );
 
-#ifndef NO_CLANG_COMPLETER
+#ifdef USE_CLANG_COMPLETER
   std::vector< const Candidate* > GetCandidatesForStrings(
       const std::vector< CompletionData > &datas );
-#endif // NO_CLANG_COMPLETER
+#endif // USE_CLANG_COMPLETER
 
 private:
   CandidateRepository() {};

cpp/ycm/ycm_core.cpp

@@ -18,12 +18,12 @@
 #include "IdentifierCompleter.h"
 #include "Future.h"
 
-#ifndef NO_CLANG_COMPLETER
+#ifdef USE_CLANG_COMPLETER
 #  include "ClangCompleter.h"
 #  include "CompletionData.h"
 #  include "Diagnostic.h"
 #  include "UnsavedFile.h"
-#endif // NO_CLANG_COMPLETER
+#endif // USE_CLANG_COMPLETER
 
 #include <boost/python.hpp>
 #include <boost/utility.hpp>
@@ -56,7 +56,7 @@ BOOST_PYTHON_MODULE(ycm_core)
     .def( "ResultsReady", &Future< void >::ResultsReady )
     .def( "GetResults", &Future< void >::GetResults );
 
-#ifndef NO_CLANG_COMPLETER
+#ifdef USE_CLANG_COMPLETER
   class_< Future< AsyncCompletions > >( "FutureCompletions" )
     .def( "ResultsReady", &Future< AsyncCompletions >::ResultsReady )
     .def( "GetResults", &Future< AsyncCompletions >::GetResults );
@@ -112,5 +112,5 @@ BOOST_PYTHON_MODULE(ycm_core)
   class_< std::vector< Diagnostic > >( "DiagnosticVec" )
     .def( vector_indexing_suite< std::vector< Diagnostic > >() );
 
-#endif // NO_CLANG_COMPLETER
+#endif // USE_CLANG_COMPLETER
 }