From 62cd6af6ed11f3db195381c919fb3bf2d92f44bd Mon Sep 17 00:00:00 2001 From: Remy Marquis Date: Wed, 27 Jan 2016 17:12:54 +0100 Subject: [PATCH] fixed luaopen_luasql_sqlite3 undefined error --- CMakeLists.txt | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e81185e8..5ebe0bfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -722,11 +722,10 @@ endif(BUNDLED_JANSSON) #----------------------------------------------------------------- if(FEATURE_LUASQL) - if(NOT BUNDLED_LUA OR NOT FEATURE_DBMS) message(STATUS "FEATURE_LUASQL needs BUNDLED_LUA and FEATURE_DBMS set!") endif(NOT BUNDLED_LUA OR NOT FEATURE_DBMS) - + FILE(GLOB LUASQL_FILES "${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.c" "${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.h" @@ -735,22 +734,27 @@ if(FEATURE_LUASQL) FILE(GLOB LUASQL_BACKEND_FILES "${CMAKE_CURRENT_LIST_DIR}/luasql/src/ls_sqlite3.c" ) - + set(LUASQL_PUBLIC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/luasql/src/luasql.h) include_directories(${SQLITE3_BUNDLED_INCLUDE_DIR}) include_directories(${LUA_BUNDLED_INCLUDE_DIR}) 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 ${SQLITE3_BUNDLED_LIBRARIES}) - + add_dependencies(luasql_library_module bundled_lua bundled_sqlite3) - + # 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") - + endif(FEATURE_LUASQL)