X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/ab7fac60a606ec7050b1159a4bb48b4c37d1f8f7..233499b0481ec5a78acca487648f2b8e121f2429:/vim/ycm_extra_conf.py

diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py
index ab42d27..f0e3679 100644
--- a/vim/ycm_extra_conf.py
+++ b/vim/ycm_extra_conf.py
@@ -15,13 +15,15 @@ def FlagsForFile(filename, **kwargs):
         # '-Wno-variadic-macros',
         # '-fexceptions',
         # '-DNDEBUG',
-        '-std=c++11',
+        '-std=c++14',
         '-stdlib=libstdc++',
         '-x', 'c++',
+        '-isystem', '/usr/include',
+        '-isystem', '/usr/local/include',
+        '-isystem', '/usr/include/qt',
         '-I', '.',
         '-I', './include',
     ]
-    flags += rospack()
     relative_to = cwd
     final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to)
 
@@ -30,22 +32,6 @@ def FlagsForFile(filename, **kwargs):
         'do_cache': True
     }
 
-# This function makes it easy to pull in additional flags from rospack
-def rospack():
-    cmd = ['rospack', 'cflags-only-I']
-    try:
-        out = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE).stdout
-    except:
-        return []
-    line = out.readline()[:-1].split(" ")
-    includes = []
-    for include in line:
-        if include.startswith(os.path.expanduser('~')):
-            includes += ['-I', include]
-        else:
-            includes += ['-isystem', include]
-    return filter(lambda a: a != ' ', includes)
-
 
 def DirectoryOfThisScript():
     return os.path.dirname(os.path.abspath(__file__))