From 79e442fcf286aa1be14cb3af5913830a69456430 Mon Sep 17 00:00:00 2001
From: Viktor Gal <viktor.gal@maeth.com>
Date: Thu, 1 Aug 2013 06:28:49 +0200
Subject: [PATCH] Fix version date macros in versionstring.h fix
 ld_library_path env setting in python_modular example

---
 CMakeLists.txt                                      | 3 +--
 cmake/version.cmake                                 | 8 ++++----
 examples/undocumented/python_modular/CMakeLists.txt | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index deec8a64593..d3a3794c8af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,8 +503,7 @@ ENDIF()
 # save configuration options
 SET(CONFIGURE_OPTIONS "TODO")
 SET(COMPFLAGS_CPP "TODO")
-SET(LINKFLAGS "TODO")
-#SET(LINKFLAGS "${POSTLINKFLAGS}")
+SET(LINKFLAGS "${POSTLINKFLAGS}")
 
 add_subdirectory(src/shogun)
 
diff --git a/cmake/version.cmake b/cmake/version.cmake
index 80562c1ba2b..70092350d82 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -30,10 +30,10 @@ IF(EXISTS "${ROOT_DIR}/.git/")
 	)
 
 	STRING(REGEX REPLACE "([0-9]+)-.*" "\\1" VERSION_YEAR "${DATEINFO}")
-	STRING(REGEX REPLACE ".*-([0-9]+)-.*" "\\1" VERSION_MONTH "${DATEINFO}")
-	STRING(REGEX REPLACE ".*-.*-([0-9]+).*" "\\1" VERSION_DAY "${DATEINFO}")
-	STRING(REGEX REPLACE ".* ([0-9]+):.*" "\\1" VERSION_HOUR "${DATEINFO}")
-	STRING(REGEX REPLACE ".*:([0-9]+):.*" "\\1" VERSION_MINUTE "${DATEINFO}")
+	STRING(REGEX REPLACE ".*-0*([0-9]+)-.*" "\\1" VERSION_MONTH "${DATEINFO}")
+	STRING(REGEX REPLACE ".*-.*-0*([0-9]+).*" "\\1" VERSION_DAY "${DATEINFO}")
+	STRING(REGEX REPLACE ".* 0*([0-9]+):.*" "\\1" VERSION_HOUR "${DATEINFO}")
+	STRING(REGEX REPLACE ".*:0*([0-9]+):.*" "\\1" VERSION_MINUTE "${DATEINFO}")
 
 	SET(REVISION_PREFIX "0x")
 	SET(PREFIX "git_")
diff --git a/examples/undocumented/python_modular/CMakeLists.txt b/examples/undocumented/python_modular/CMakeLists.txt
index e63f0317cc0..2afb05f10a3 100644
--- a/examples/undocumented/python_modular/CMakeLists.txt
+++ b/examples/undocumented/python_modular/CMakeLists.txt
@@ -2,11 +2,11 @@ LIST(APPEND ENV_VARS GDB="gdb -x ${CMAKE_SOURCE_DIR}/src/.gdb --args")
 LIST(APPEND ENV_VARS PYTHON=${PYTHON_EXECUTABLE})
 LIST(APPEND ENV_VARS PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${PYTHON_PACKAGES_PATH})
 if(WIN32)
-  LIST(APPEND ENV_VARS PATH="${CMAKE_INSTALL_PREFIX}/lib;$ENV{PATH}")
+  LIST(APPEND ENV_VARS PATH=${CMAKE_INSTALL_PREFIX}/lib;$ENV{PATH})
 elseif(APPLE)
-  LIST(APPEND ENV_VARS DYLD_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/lib:$ENV{DYLD_LIBRARY_PATH}")
+  LIST(APPEND ENV_VARS DYLD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:$ENV{DYLD_LIBRARY_PATH})
 else()
-  LIST(APPEND ENV_VARS LD_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/lib:$ENV{LD_LIBRARY_PATH}")
+  LIST(APPEND ENV_VARS LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:$ENV{LD_LIBRARY_PATH})
 endif()
 
 FILE(GLOB PYTHON_EXAMPLES *.py)