Index: cmake/modules/FindLibLuaLib50.cmake =================================================================== --- cmake/modules/FindLibLuaLib50.cmake (revision 2332) +++ cmake/modules/FindLibLuaLib50.cmake (working copy) @@ -1,59 +0,0 @@ -# - Try to find the LibLuaLib50 -# Once done this will define -# -# LIBLUALIB50_FOUND - system has the LibLuaLib50 -# LIBLUALIB50_INCLUDE_DIR - the LibLuaLib50 include directory -# LIBLUALIB50_LIBRARIES - The libraries needed to use LibLuaLib50 -# under Windows this also checks in the GNUWIN32 directory, so make -# sure that the GNUWIN32 directory gets found if you use the GNUWIN32 version of PCRE -# under UNIX pkgconfig among others pkg-config is used to find the directories - - -INCLUDE(UsePkgConfig) - -# use pkg-config to get the directories and then use these values -# in the FIND_PATH() and FIND_LIBRARY() calls -PKGCONFIG(lualib50 _libLualib50IncDir _libLualib50LinkDir _libLualib50LinkFlags _libLualib50Cflags) -#retry lua.pc for gentoo ... -PKGCONFIG(lua _libLualibIncDir _libLualibLinkDir _libLualibLinkFlags _libLualibCflags) - -set(LIBLUALIB50_DEFINITIONS ${_libLualib50Cflags} ${_libLualibCflags} ) - -# under windows, try to find the base gnuwin32 directory, do nothing under UNIX -FIND_PACKAGE(GNUWIN32) - -FIND_PATH(LIBLUALIB50_INCLUDE_DIR lualib.h - ${_libLualib50IncDir}/lua50 - ${_libLualibIncDir} - /usr/include/lua50 - /usr/local/include/lua50 - ${GNUWIN32_DIR}/include -) - -FIND_LIBRARY(LIBLUALIB50_LIBRARIES NAMES lualib50 lualib lua - PATHS - ${_libLualib50LinkDir} - ${_libLualibLinkDir} - /usr/lib - /usr/local/lib - ${GNUWIN32_DIR}/lib -) - - -if (LIBLUALIB50_INCLUDE_DIR AND LIBLUALIB50_LIBRARIES) - set(LIBLUALIB50_FOUND TRUE) -endif (LIBLUALIB50_INCLUDE_DIR AND LIBLUALIB50_LIBRARIES) - - -if (LIBLUALIB50_FOUND) - if (NOT LibLuaLib50_FIND_QUIETLY) - message(STATUS "Found liblualib(50): ${LIBLUALIB50_LIBRARIES}") - endif (NOT LibLuaLib50_FIND_QUIETLY) -else (LIBLUALIB50_FOUND) - if (LibLuaLib50_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find liblualib(50)") - endif (LibLuaLib50_FIND_REQUIRED) -endif (LIBLUALIB50_FOUND) - -MARK_AS_ADVANCED(LIBLUALIB50_INCLUDE_DIR LIBLUALIB50_LIBRARIES) - Index: cmake/modules/FindLibLua50.cmake =================================================================== --- cmake/modules/FindLibLua50.cmake (revision 2332) +++ cmake/modules/FindLibLua50.cmake (working copy) @@ -1,62 +0,0 @@ -# - Try to find the LibLua50 -# Once done this will define -# -# LIBLUA50_FOUND - system has the LibLua50 -# LIBLUA50_INCLUDE_DIR - the LibLua50 include directory -# LIBLUA50_LIBRARIES - The libraries needed to use LibLua50 -# under Windows this also checks in the GNUWIN32 directory, so make -# sure that the GNUWIN32 directory gets found if you use the GNUWIN32 version of PCRE -# under UNIX pkgconfig among others pkg-config is used to find the directories - - -INCLUDE(UsePkgConfig) - -# use pkg-config to get the directories and then use these values -# in the FIND_PATH() and FIND_LIBRARY() calls -#debian -PKGCONFIG(lua50 _libLua50IncDir _libLua50LinkDir _libLua50LinkFlags _libLua50Cflags) -#gentoo -PKGCONFIG(lua _libLuaIncDir _libLuaLinkDir _libLuaLinkFlags _libLuaCflags) -#any other distrib to blame for using common naming ? -# - -set(LIBLUA50_DEFINITIONS ${_libLua50Cflags} ${_libLuaCflags} ) - -# under windows, try to find the base gnuwin32 directory, do nothing under UNIX -FIND_PACKAGE(GNUWIN32) - -FIND_PATH(LIBLUA50_INCLUDE_DIR lua.h - ${_libLua50IncDir}/lua50 - ${_libLuaIncDir} - /usr/include/lua50 - /usr/local/include/lua50 - ${GNUWIN32_DIR}/include -) - -FIND_LIBRARY(LIBLUA50_LIBRARIES NAMES lua50 lua - PATHS - ${_libLua50LinkDir} - ${_libLuaLinkDir} - /usr/lib - /usr/local/lib - ${GNUWIN32_DIR}/lib -) - - -if (LIBLUA50_INCLUDE_DIR AND LIBLUA50_LIBRARIES) - set(LIBLUA50_FOUND TRUE) -endif (LIBLUA50_INCLUDE_DIR AND LIBLUA50_LIBRARIES) - - -if (LIBLUA50_FOUND) - if (NOT LibLua50_FIND_QUIETLY) - message(STATUS "Found liblua(50): ${LIBLUA50_LIBRARIES}") - endif (NOT LibLua50_FIND_QUIETLY) -else (LIBLUA50_FOUND) - if (LibLua50_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find liblua(50)") - endif (LibLua50_FIND_REQUIRED) -endif (LIBLUA50_FOUND) - -MARK_AS_ADVANCED(LIBLUA50_INCLUDE_DIR LIBLUA50_LIBRARIES) - Index: cmake/modules/FindLibLua51.cmake =================================================================== --- cmake/modules/FindLibLua51.cmake (revision 0) +++ cmake/modules/FindLibLua51.cmake (revision 0) @@ -0,0 +1,62 @@ +# - Try to find the LibLua51 +# Once done this will define +# +# LIBLUA51_FOUND - system has the LibLua51 +# LIBLUA51_INCLUDE_DIR - the LibLua51 include directory +# LIBLUA51_LIBRARIES - The libraries needed to use LibLua51 +# under Windows this also checks in the GNUWIN32 directory, so make +# sure that the GNUWIN32 directory gets found if you use the GNUWIN32 version of PCRE +# under UNIX pkgconfig among others pkg-config is used to find the directories + + +INCLUDE(UsePkgConfig) + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +#debian +PKGCONFIG(lua51 _libLua51IncDir _libLua51LinkDir _libLua51LinkFlags _libLua51Cflags) +#gentoo +PKGCONFIG(lua _libLuaIncDir _libLuaLinkDir _libLuaLinkFlags _libLuaCflags) +#any other distrib to blame for using common naming ? +# + +set(LIBLUA51_DEFINITIONS ${_libLua51Cflags} ${_libLuaCflags} ) + +# under windows, try to find the base gnuwin32 directory, do nothing under UNIX +FIND_PACKAGE(GNUWIN32) + +FIND_PATH(LIBLUA51_INCLUDE_DIR lua.h + ${_libLua51IncDir}/lua + ${_libLuaIncDir} + /usr/include/lua + /usr/local/include/lua + ${GNUWIN32_DIR}/include +) + +FIND_LIBRARY(LIBLUA51_LIBRARIES NAMES lua5.1 lua + PATHS + ${_libLua51LinkDir} + ${_libLuaLinkDir} + /usr/lib + /usr/local/lib + ${GNUWIN32_DIR}/lib +) + + +if (LIBLUA51_INCLUDE_DIR AND LIBLUA51_LIBRARIES) + set(LIBLUA51_FOUND TRUE) +endif (LIBLUA51_INCLUDE_DIR AND LIBLUA51_LIBRARIES) + + +if (LIBLUA51_FOUND) + if (NOT LibLua51_FIND_QUIETLY) + message(STATUS "Found liblua(5.1): ${LIBLUA51_LIBRARIES}") + endif (NOT LibLua51_FIND_QUIETLY) +else (LIBLUA51_FOUND) + if (LibLua51_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find liblua(5.1)") + endif (LibLua51_FIND_REQUIRED) +endif (LIBLUA51_FOUND) + +MARK_AS_ADVANCED(LIBLUA51_INCLUDE_DIR LIBLUA51_LIBRARIES) + Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 2332) +++ CMakeLists.txt (working copy) @@ -66,8 +66,7 @@ endif(APPLE) ### lua -find_package(LibLua50 REQUIRED) -find_package(LibLuaLib50 REQUIRED) +find_package(LibLua51 REQUIRED) ### Qt if (ENABLE_QYZIS) @@ -125,7 +124,7 @@ endif (CMAKE_COMPILER_IS_GNUCXX) # libyzis dependencies includes -set(YZIS_INCLUDES ${QT_INCLUDES} ${LIBLUA50_INCLUDE_DIR} ${LIBLUALIB50_INCLUDE_DIR} ${MAGIC_INCLUDE_DIR}) +set(YZIS_INCLUDES ${QT_INCLUDES} ${LIBLUA51_INCLUDE_DIR} ${LIBLUALIB51_INCLUDE_DIR} ${MAGIC_INCLUDE_DIR}) # libyzis includes set(YZIS_INCLUDES ${YZIS_INCLUDES} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/libyzis ${CMAKE_SOURCE_DIR}/libyzis) Index: libyzis/CMakeLists.txt =================================================================== --- libyzis/CMakeLists.txt (revision 2332) +++ libyzis/CMakeLists.txt (working copy) @@ -64,7 +64,7 @@ add_library(yzis SHARED ${yzis_LIB_SRCS} ${yzis_LIB_MOC_SRCS} ) -target_link_libraries(yzis ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${LIBLUA50_LIBRARIES} ${LIBLUALIB50_LIBRARIES} ${MAGIC_LIBRARIES} ${GETTEXT_LIBRARIES}) +target_link_libraries(yzis ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${LIBLUA51_LIBRARIES} ${LIBLUALIB51_LIBRARIES} ${MAGIC_LIBRARIES} ${GETTEXT_LIBRARIES}) set_target_properties(yzis PROPERTIES VERSION 0.0.0 SOVERSION 0 )