diff options
| -rw-r--r-- | src/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | support/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | support/luajit2-2.1-agentzh.zip | bin | 1223529 -> 1231367 bytes |
3 files changed, 11 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9c28334..56862e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,7 @@ cmake_minimum_required(VERSION 3.5) SET(CMAKE_CXX_COMPILER /usr/bin/g++) aux_source_directory(. DIR_LIB_SRCS) -include_directories("../support/install/include/luajit-2.1" "/usr/local/include/gperftools/") -link_directories("../support/install/lib") -#link_libraries("libluajit-5.1.so") +include_directories("${CMAKE_CURRENT_BINARY_DIR}/../support/install/include/luajit-2.1") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -shared -fPIC") SET(CMAKE_CXX_DEBUG_FLAGS "${CMAKE_CXX_DEBUG_FLAGS} -DTSG_LUA_DEBUG") @@ -11,10 +9,11 @@ SET(CMAKE_BUILD_TYPE "Release") add_library(tsglua_static ${DIR_LIB_SRCS}) add_library(tsglua SHARED ${DIR_LIB_SRCS}) set_target_properties(tsglua_static PROPERTIES OUTPUT_NAME "tsglua") + target_link_libraries(tsglua dl luajit2-static) -set_target_properties(tsglua PROPERTIES PREFIX "") +#set_target_properties(tsglua PROPERTIES PREFIX "") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libtsglua.so DESTINATION ${PROJECT_SOURCE_DIR}/lib COMPONENT PROFILE) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libtsglua.a DESTINATION ${PROJECT_SOURCE_DIR}/lib COMPONENT PROFILE) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtsglua.so DESTINATION ${PROJECT_SOURCE_DIR}/lib COMPONENT PROFILE) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtsglua.a DESTINATION ${PROJECT_SOURCE_DIR}/lib COMPONENT PROFILE) install(FILES ${PROJECT_SOURCE_DIR}/src/tsg_lua_interface.h DESTINATION ${PROJECT_SOURCE_DIR}/include COMPONENT PROFILE) diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index bc1a513..5f8a8ee 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -1,11 +1,10 @@ include(ExternalProject) -set(LUAJIT2_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) +set(LUAJIT2_ROOT ${CMAKE_CURRENT_BINARY_DIR}) set(LUAJIT2_URL ${CMAKE_CURRENT_SOURCE_DIR}/luajit2-2.1-agentzh.zip) -set(LUAJIT2_URL_MD5 605edb76eb1ff6b9364afe7fef58c83e) -#set(LUAJIT2_CONFIGURE ) -set(LUAJIT2_MAKE cd ${LUAJIT2_ROOT}/src/luajit2 && make) -set(LUAJIT2_INSTALL cd ${LUAJIT2_ROOT}/src/luajit2 && make install PREFIX=${LUAJIT2_ROOT}/install) +set(LUAJIT2_URL_MD5 6e17cd2263473f9b85b47d0736cf12da) +set(LUAJIT2_MAKE cd ${LUAJIT2_ROOT}/luajit2/src/luajit2 && make) +set(LUAJIT2_INSTALL cd ${LUAJIT2_ROOT}/luajit2/src/luajit2 && make install PREFIX=${LUAJIT2_ROOT}/install) ExternalProject_Add(luajit2 PREFIX luajit2 @@ -15,15 +14,11 @@ ExternalProject_Add(luajit2 CONFIGURE_COMMAND "" BUILD_COMMAND ${LUAJIT2_MAKE} INSTALL_COMMAND ${LUAJIT2_INSTALL} + BUILD_IN_SOURCE 1 ) -ExternalProject_Get_Property(luajit2 INSTALL_DIR) -file(MAKE_DIRECTORY ${INSTALL_DIR}/include) add_library(luajit2-static STATIC IMPORTED GLOBAL) add_dependencies(luajit2-static luajit2) -set_property(TARGET luajit2-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libluajit-5.1.a) -set_property(TARGET luajit2-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) - - +set_property(TARGET luajit2-static PROPERTY IMPORTED_LOCATION ${LUAJIT2_ROOT}/install/lib/libluajit-5.1.a) diff --git a/support/luajit2-2.1-agentzh.zip b/support/luajit2-2.1-agentzh.zip Binary files differindex d95b6a0..12a941f 100644 --- a/support/luajit2-2.1-agentzh.zip +++ b/support/luajit2-2.1-agentzh.zip |