From c213732dc8e6cc877c979f9e65b2f75ce594610c Mon Sep 17 00:00:00 2001
From: Ravi R Kiran <aine.marina@gmail.com>
Date: Fri, 23 Oct 2015 14:32:36 -0700
Subject: Enable RTags


diff --git a/Readme.org b/Readme.org
index c5f3671..b39f9d5 100644
--- a/Readme.org
+++ b/Readme.org
@@ -49,5 +49,14 @@ pdf-tools:
 pushd site-lisp/pdftools
 make -s
 make install-package
+popd
 #+END_SRC
 May need to install poppler-devel, poppler-glib-devel on Fedora.
+
+rtags:
+#+BEGIN_SRC sh
+pushd site-lisp/rtags
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+make
+popd
+#+END_SRC
diff --git a/lisp/ravi-init-cpp.el b/lisp/ravi-init-cpp.el
index ffa9790..132919a 100644
--- a/lisp/ravi-init-cpp.el
+++ b/lisp/ravi-init-cpp.el
@@ -136,14 +136,17 @@
       )
 
     (use-package rtags
-      :load-path ,(ravi/emacs-file "site-lisp/rtags/src")
-      :init
+      :load-path (lambda () (ravi/emacs-file "site-lisp/rtags/src"))
+      :config
       (progn
-        (setq rtags-path (ravi/emacs-file "site-lisp/rtags"))
+        (setq rtags-path (ravi/emacs-file "site-lisp/rtags/bin"))
         (rtags-enable-standard-keybindings c-mode-base-map)
 
-        (use-package rtags-ac)
-        ))
+        (use-package company-rtags
+          :config
+          (progn
+            (bind-key "C-<tab>" 'company-rtags c-mode-base-map)
+            (add-to-list 'company-backends 'company-rtags)))))
 
     (defvar printf-index 0)
 
diff --git a/site-lisp/rtags b/site-lisp/rtags
new file mode 160000
index 0000000..9a1bd6d
--- /dev/null
+++ b/site-lisp/rtags
@@ -0,0 +1 @@
+Subproject commit 9a1bd6db440bd0c947eb390034a667f740e1285b
-- 
cgit v0.10.1