Skip to content

Commit

Permalink
Fix version date macros in versionstring.h
Browse files Browse the repository at this point in the history
fix ld_library_path env setting in python_modular example
  • Loading branch information
vigsterkr committed Aug 1, 2013
1 parent 0aae6ea commit 79e442f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions cmake/version.cmake
Expand Up @@ -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_")
Expand Down
6 changes: 3 additions & 3 deletions examples/undocumented/python_modular/CMakeLists.txt
Expand Up @@ -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)
Expand Down

0 comments on commit 79e442f

Please sign in to comment.