qulogic/gplugin

flow: Merged <release> '0.0.20' to <master> ('default').
v0.0.20
2015-05-07, Gary Kramlich
d161290ac41e
Parents 66ea3e1aba27e47e409b9dab
Children cba077176480
flow: Merged '0.0.20' to ('default').
3 files changed, 8 insertions(+), 4 deletions(-)
  • +3 -3
    CMakeLists.txt
  • +4 -0
    ChangeLog
  • +1 -1
    lua/CMakeLists.txt
    • --- a/CMakeLists.txt Wed May 06 10:46:55 2015 -0500
    +++ b/CMakeLists.txt Thu May 07 21:46:29 2015 -0500
    @@ -11,13 +11,13 @@
    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Compatibility)
    endif(${CMAKE_VERSION} VERSION_LESS "2.8.3")
    -if(${CMAKE_VERSION} VERSION_GREATER "2.8.12")
    +if(${CMAKE_VERSION} VERSION_GREATER "3.0.0")
    # allow reading of the LOCATION property
    cmake_policy(SET CMP0026 OLD)
    # don't force target names to match a pattern
    cmake_policy(SET CMP0037 OLD)
    -endif(${CMAKE_VERSION} VERSION_GREATER "2.8.12")
    +endif(${CMAKE_VERSION} VERSION_GREATER "3.0.0")
    ###############################################################################
    # Project Info
    @@ -26,7 +26,7 @@
    set(GPLUGIN_MAJOR_VERSION 0)
    set(GPLUGIN_MINOR_VERSION 0)
    -set(GPLUGIN_MICRO_VERSION 19)
    +set(GPLUGIN_MICRO_VERSION 20)
    set(GPLUGIN_EXTRA_VERSION)
    set(GPLUGIN_VERSION ${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.${GPLUGIN_MICRO_VERSION}${GPLUGIN_EXTRA_VERSION})
    --- a/ChangeLog Wed May 06 10:46:55 2015 -0500
    +++ b/ChangeLog Thu May 07 21:46:29 2015 -0500
    @@ -1,3 +1,7 @@
    +0.0.20: 2015/05/07
    + * Fixed the lua dependency checks for Fedora 20
    + * Fixed the build on cmake<3.0.0
    +
    0.0.19: 2015/05/06
    * Add debug packages to the Debian packaging
    * Add libgplugin-loaders package to the Debian packaging
    --- a/lua/CMakeLists.txt Wed May 06 10:46:55 2015 -0500
    +++ b/lua/CMakeLists.txt Thu May 07 21:46:29 2015 -0500
    @@ -20,7 +20,7 @@
    gplugin-lua-plugin.h
    )
    - set(_LUAS "luajit>=2.0.0;lua5.2>=5.2.0;lua5.1>=5.1.0")
    + set(_LUAS "luajit>=2.0.0;lua>=5.1.0;lua5.2>=5.2.0;lua5.1>=5.1.0")
    foreach(_LUA ${_LUAS})
    if(NOT LUA_FOUND)
    pkg_check_modules(LUA ${_LUA})