diff --git a/helpers/create-abi-dump.py b/helpers/create-abi-dump.py --- a/helpers/create-abi-dump.py +++ b/helpers/create-abi-dump.py @@ -211,21 +211,23 @@ additionalIncludes = set() # type: Set[str] # list of general include directories - noHeaders = set(buildEnvironment.get('CMAKE_PREFIX_PATH').split(":")) - noHeaders |= set([i+"/include" for i in buildEnvironment.get('CMAKE_PREFIX_PATH').split(":")]) + prefixHeaders = [os.path.abspath(i) for i in buildEnvironment.get('CMAKE_PREFIX_PATH').split(":")] + noHeaders = set(prefixHeaders) + noHeaders |= set([os.path.join(i,"include") for i in prefixHeaders]) # From the target information we previously collected... # Grab the list of libraries and include headers for abi-compliance-checker for target in self.targets.values(): # Check each include directory to see if we need to add it.... for i in target['include_dirs']: + abspath = os.path.abspath(i) # ignore general folders, as there are no lib specific headers are placed - if i in noHeaders or i.endswith("/KF5"): - additionalIncludes.add(i) + if abspath in noHeaders or abspath.endswith("/KF5"): + additionalIncludes.add(abspath) continue # Otherwise, if we don't already have it - add it to the list! - headers.add(i) + headers.add(abspath) # If the library path isn't in the list, then we should add it to the list libs.add(target['path'])