[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35970] trunk/blender/build_files/cmake/ macros.cmake: fix cmake for when BLENDER_VERSION_CHAR is not set.

[Campbell Barton]

Revision: 35970
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35970
Author:   campbellbarton
Date:     2011-04-03 07:48:33 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
fix cmake for when BLENDER_VERSION_CHAR is not set.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake        2011-04-03 05:29:58 UTC 
(rev 35969)
+++ trunk/blender/build_files/cmake/macros.cmake        2011-04-03 07:48:33 UTC 
(rev 35970)
@@ -350,7 +350,12 @@
                message(FATAL_ERROR "Version parsing failed for 
BLENDER_SUBVERSION")
        endif()
 
-       if(NOT ${_out_version_char} MATCHES "[a-z]+")
+       # clumsy regex, only single char are ok but it could be unset
+
+       string(LENGTH "${_out_version_char}" _out_version_char_len)
+       if(NOT _out_version_char_len EQUAL 1)
+               set(_out_version_char "")
+       elseif(NOT ${_out_version_char} MATCHES "[a-z]+")
                message(FATAL_ERROR "Version parsing failed for 
BLENDER_VERSION_CHAR")
        endif()
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs