testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 440807 from home:alarrosa:branches:devel:tools:building

Browse Source 
- Do not mix tabs and spaces in cmake.prov

OBS-URL: https://build.opensuse.org/request/show/440807
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=277
This commit is contained in:
Ismail Dönmez 2016-11-18 13:14:56 +00:00 committed by Git OBS Bridge
parent 26a5163b02
commit 60f21c96d9
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 18 09:30:47 UTC 2016 - alarrosa@suse.com
- Do not mix tabs and spaces in cmake.prov
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 16 14:30:02 UTC 2016 - foss@grueninger.de Wed Nov 16 14:30:02 UTC 2016 - foss@grueninger.de

14
cmake.prov
View File

@ -32,8 +32,8 @@ class CMakeParser:
paths = map(lambda x: x.rstrip(), filelist.readlines()) paths = map(lambda x: x.rstrip(), filelist.readlines())
for path in paths: for path in paths:
for (modulePath, cmakeModule, lowercase) in self.parseCmakeModuleConfig(path): for (modulePath, cmakeModule, lowercase) in self.parseCmakeModuleConfig(path):
version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase)
if version: if version:
print("cmake(%s) = %s" % (cmakeModule, version)) print("cmake(%s) = %s" % (cmakeModule, version))
else: else:
@ -46,15 +46,15 @@ class CMakeParser:
result = [] result = []
for configFile in glob.glob("%s/*Config.cmake" % modulePath): for configFile in glob.glob("%s/*Config.cmake" % modulePath):
moduleName = configFile[len(modulePath) + 1:-len("Config.cmake")] moduleName = configFile[len(modulePath) + 1:-len("Config.cmake")]
result.append( (modulePath, moduleName, False) ) result.append( (modulePath, moduleName, False) )
for configFile in glob.glob("%s/*-config.cmake" % modulePath): for configFile in glob.glob("%s/*-config.cmake" % modulePath):
moduleName = configFile[len(modulePath) + 1:-len("-config.cmake")] moduleName = configFile[len(modulePath) + 1:-len("-config.cmake")]
if (modulePath, moduleName, False) not in result: if (modulePath, moduleName, False) not in result:
result.append( (modulePath, moduleName, True) ) result.append( (modulePath, moduleName, True) )
return result return result
def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase): def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase):
versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule) versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)