Merge branch 'master' of github.com:PDAL/PDAL

apps/pdal-config.in

@@ -7,7 +7,7 @@ libdir=@libdir@
 usage()
 {
 	cat <<EOF
-Usage: liblas-config [OPTIONS]
+Usage: pdal-config [OPTIONS]
 Options:
 	[--libs]
 	[--cflags]

doc/conf.py

@@ -50,21 +50,21 @@
 # The short X.Y version.
 
 def read_version(filename):
-    # oh yes, this is brittle
+    #
+    # set(PDAL_VERSION_STRING 0.9.8 CACHE STRING "PDAL version")
     data = open(filename).readlines()
-    full = 'PDAL_VERSION_STRING'
-
-    for line in data:
-        if str(full) in line:
-            matchObj = re.search( r' (\d+\.\d+\.\d+) ', line, re.I )
-            if matchObj:
-                return matchObj.group(1)
 
-    return '0.0.0'
-
-version = read_version('../CMakeLists.txt')
-release = version
+    token = 'PDAL_VERSION_STRING'
 
+    for line in data:
+        if str(token) in line:
+            line = line.replace('SET('+token+' ', '')
+            line = line.replace(' CACHE STRING "PDAL VERSION")','')
+            line = line.replace('"','')
+            version = line.strip()
+    return '%s'%(version)
+
+release = read_version('../CMakeLists.txt')
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.