Add toluapp subtree (#712)
* First commit!
* Import to git
* Droping down CMake requirement
* Corrected installation of libraries
* Adding travis build
* Updated cmake macros
* Fixed find package
* Updated travis hook
* Updated travis hook
* Patch to support Lua 5.3.
* Fix Lua header include directives in tolua++.h
Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers.
As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble.
But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers.
Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first.
See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195
* Remove email notifications.
* Update travis build.
* Build shared and static libs.
* Patch toluapp to support Lua 5.3.
With this change, support for Lua 5.1 is dropped.
This resolve #116.
* Add some comments to clarify the toluapp handling.
* Add minor sonar fix.
2018-12-20 20:18:51 +00:00
|
|
|
# Copyright (C) 2007-2012 LuaDist.
|
|
|
|
|
# Created by Peter Kapec
|
|
|
|
|
# Redistribution and use of this file is allowed according to the terms of the MIT license.
|
|
|
|
|
# For details see the COPYRIGHT file distributed with LuaDist.
|
|
|
|
|
# Please note that the package source code is licensed under its own license.
|
|
|
|
|
|
|
|
|
|
project ( toluapp C )
|
|
|
|
|
cmake_minimum_required ( VERSION 3.4 )
|
|
|
|
|
# Disable dist stuff, we're not installing this as a lib
|
|
|
|
|
# include ( cmake/dist.cmake )
|
|
|
|
|
|
|
|
|
|
include(FindPkgConfig)
|
|
|
|
|
|
2018-12-24 14:52:17 +00:00
|
|
|
pkg_search_module(LUA REQUIRED lua>=5.3 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52)
|
Add toluapp subtree (#712)
* First commit!
* Import to git
* Droping down CMake requirement
* Corrected installation of libraries
* Adding travis build
* Updated cmake macros
* Fixed find package
* Updated travis hook
* Updated travis hook
* Patch to support Lua 5.3.
* Fix Lua header include directives in tolua++.h
Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers.
As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble.
But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers.
Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first.
See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195
* Remove email notifications.
* Update travis build.
* Build shared and static libs.
* Patch toluapp to support Lua 5.3.
With this change, support for Lua 5.1 is dropped.
This resolve #116.
* Add some comments to clarify the toluapp handling.
* Add minor sonar fix.
2018-12-20 20:18:51 +00:00
|
|
|
include_directories ( include src/lib ${LUA_INCLUDE_DIRS} )
|
|
|
|
|
|
|
|
|
|
# Build lib
|
|
|
|
|
file ( GLOB SRC_LIBTOLUAPP src/lib/*.c )
|
|
|
|
|
if ( MSVC )
|
|
|
|
|
set ( DEF_FILE libtoluapp.def )
|
|
|
|
|
endif ( )
|
|
|
|
|
|
|
|
|
|
# add_library ( toluapp_lib SHARED ${SRC_LIBTOLUAPP} ${DEF_FILE} )
|
|
|
|
|
add_library ( toluapp_lib_static STATIC ${SRC_LIBTOLUAPP} ${DEF_FILE} )
|
|
|
|
|
target_link_libraries ( toluapp_lib_static ${LUA_LIBRARIES} )
|
|
|
|
|
set_target_properties ( toluapp_lib_static PROPERTIES COMPILE_FLAGS -fPIC) # -fPIC required for static linking
|
|
|
|
|
set_target_properties ( toluapp_lib_static PROPERTIES OUTPUT_NAME toluapp CLEAN_DIRECT_OUTPUT
|
|
|
|
|
1 )
|
|
|
|
|
|
|
|
|
|
# Build app
|
|
|
|
|
include_directories ( src/bin )
|
|
|
|
|
set ( SRC_TOLUA src/bin/tolua.c src/bin/toluabind.c )
|
|
|
|
|
add_executable ( toluapp ${SRC_TOLUA} )
|
|
|
|
|
target_link_libraries ( toluapp toluapp_lib_static ${LUA_LIBRARIES} )
|
|
|
|
|
|
|
|
|
|
# Disable installation, we don't need these at runtime for Conky
|
|
|
|
|
# Install
|
|
|
|
|
#install_library ( toluapp_lib )
|
|
|
|
|
#install_executable ( toluapp )
|
|
|
|
|
#install_header ( include/ )
|
|
|
|
|
#install_data ( README INSTALL )
|
|
|
|
|
#install_doc ( doc/ )
|