qulogic/gplugin

flow: Merged <feature> 'build-fixes' to <develop> ('develop').
develop
2015-05-07, Gary Kramlich
bb01a79111f7
Parents f7e92a9a065645fff5d9b2cb
Children 76d0537f1228d883ddced36d
flow: Merged 'build-fixes' to ('develop').
2 files changed, 3 insertions(+), 3 deletions(-)
  • +2 -2
    CMakeLists.txt
  • +1 -1
    lua/CMakeLists.txt
    • --- a/CMakeLists.txt Wed May 06 10:46:55 2015 -0500
    +++ b/CMakeLists.txt Thu May 07 21:41:50 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
    --- a/lua/CMakeLists.txt Wed May 06 10:46:55 2015 -0500
    +++ b/lua/CMakeLists.txt Thu May 07 21:41:50 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})