etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2024-11-10 23:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed luaopen_luasql_sqlite3 undefined error

Browse source
This commit is contained in:
Remy Marquis 2016-01-27 17:12:54 +01:00
parent a8f2ed0e73
commit 62cd6af6ed
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -722,11 +722,10 @@ endif(BUNDLED_JANSSON)
#----------------------------------------------------------------- #-----------------------------------------------------------------
if(FEATURE_LUASQL) if(FEATURE_LUASQL)
if(NOT BUNDLED_LUA OR NOT FEATURE_DBMS) if(NOT BUNDLED_LUA OR NOT FEATURE_DBMS)
message(STATUS "FEATURE_LUASQL needs BUNDLED_LUA and FEATURE_DBMS set!") message(STATUS "FEATURE_LUASQL needs BUNDLED_LUA and FEATURE_DBMS set!")
endif(NOT BUNDLED_LUA OR NOT FEATURE_DBMS) endif(NOT BUNDLED_LUA OR NOT FEATURE_DBMS)
FILE(GLOB LUASQL_FILES FILE(GLOB LUASQL_FILES
"${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.c" "${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.c"
"${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.h" "${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.h"
@ -735,22 +734,27 @@ if(FEATURE_LUASQL)
FILE(GLOB LUASQL_BACKEND_FILES FILE(GLOB LUASQL_BACKEND_FILES
"${CMAKE_CURRENT_LIST_DIR}/luasql/src/ls_sqlite3.c" "${CMAKE_CURRENT_LIST_DIR}/luasql/src/ls_sqlite3.c"
) )
set(LUASQL_PUBLIC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.h) set(LUASQL_PUBLIC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.h)
include_directories(${SQLITE3_BUNDLED_INCLUDE_DIR}) include_directories(${SQLITE3_BUNDLED_INCLUDE_DIR})
include_directories(${LUA_BUNDLED_INCLUDE_DIR}) include_directories(${LUA_BUNDLED_INCLUDE_DIR})
add_library(luasql_library_module MODULE ${LUASQL_PUBLIC_HEADERS} ${LUASQL_FILES} ${LUASQL_BACKEND_FILES}) add_library(luasql_library_module MODULE ${LUASQL_PUBLIC_HEADERS} ${LUASQL_FILES} ${LUASQL_BACKEND_FILES})
set_target_properties(luasql_library_module PROPERTIES PREFIX "" OUTPUT_NAME "sqlite3") set_target_properties(luasql_library_module PROPERTIES
C_VISIBILITY_PRESET default
VISIBILITY_INLINES_HIDDEN 0
PREFIX ""
OUTPUT_NAME "sqlite3"
)
target_link_libraries(luasql_library_module ${LUA_BUNDLED_LIBRARIES}) target_link_libraries(luasql_library_module ${LUA_BUNDLED_LIBRARIES})
target_link_libraries(luasql_library_module ${SQLITE3_BUNDLED_LIBRARIES}) target_link_libraries(luasql_library_module ${SQLITE3_BUNDLED_LIBRARIES})
add_dependencies(luasql_library_module bundled_lua bundled_sqlite3) add_dependencies(luasql_library_module bundled_lua bundled_sqlite3)
# FIXME: move to cmake/ETLInstall.cmake # FIXME: move to cmake/ETLInstall.cmake
# this file should go into fs_homepath/legacy ... # this file should go into fs_homepath/legacy ...
install(TARGETS luasql_library_module DESTINATION "${INSTALL_DEFAULT_MODDIR}/legacy/lualibs/luasql") install(TARGETS luasql_library_module DESTINATION "${INSTALL_DEFAULT_MODDIR}/legacy/lualibs/luasql")
endif(FEATURE_LUASQL) endif(FEATURE_LUASQL)