diff options
| author | yangwei <[email protected]> | 2023-06-02 17:47:38 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2023-06-02 17:47:38 +0800 |
| commit | f384a719c26668424cb6e1f88a1c628975166b3a (patch) | |
| tree | a1909ad74a2568d0b77ee737aeff8c8b93895301 /support | |
| parent | 7760c274c258b19585f40b8db5f443d7ead425d6 (diff) | |
🔧 build(cmake): 调整luajit编译方式，控制在build目录内Build-refactor-luajit-compile
Diffstat (limited to 'support')
| -rw-r--r-- | support/CMakeLists.txt | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index ea15756..b5354a5 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -1,28 +1,23 @@ # CMakeFiles for 3rd vendor library include(ExternalProject) -### luajit-2.1 -set(LUAJIT2_ROOT ${CMAKE_CURRENT_BINARY_DIR}) -set(LUAJIT2_URL ${CMAKE_CURRENT_SOURCE_DIR}/luajit2-2.1-agentzh.zip) -set(LUAJIT2_URL_MD5 37c03c469aa461ec44a0e4cebf1ceb52) -set(LUAJIT2_MAKE cd ${LUAJIT2_ROOT}/luajit2/src/luajit2 && make BUILD_STATIC_LIB=${BUILD_STATIC_LIB}) -set(LUAJIT2_INSTALL cd ${LUAJIT2_ROOT}/luajit2/src/luajit2 && make install PREFIX=${LUAJIT_INSTALL_PREFIX}) ExternalProject_Add(luajit2 PREFIX luajit2 - URL ${LUAJIT2_URL} - URL_MD5 ${LUAJIT2_URL_MD5} - #CONFIGURE_COMMAND ${LUAJIT2_CONFIGURE} + URL ${CMAKE_CURRENT_SOURCE_DIR}/luajit2-2.1-agentzh.zip + URL_MD5 37c03c469aa461ec44a0e4cebf1ceb52 CONFIGURE_COMMAND "" - BUILD_COMMAND ${LUAJIT2_MAKE} - INSTALL_COMMAND ${LUAJIT2_INSTALL} + BUILD_COMMAND make + INSTALL_COMMAND "" BUILD_IN_SOURCE 1 ) - +ExternalProject_Get_Property(luajit2 SOURCE_DIR) +file(MAKE_DIRECTORY ${SOURCE_DIR}/src) add_library(luajit2-static STATIC IMPORTED GLOBAL) add_dependencies(luajit2-static luajit2) -set_property(TARGET luajit2-static PROPERTY IMPORTED_LOCATION ${LUAJIT_INSTALL_PREFIX}/lib/libluajit-5.1.a) +set_property(TARGET luajit2-static PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libluajit.a) +set_property(TARGET luajit2-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src) #### GoogleTest ExternalProject_Add(GoogleTest @@ -36,6 +31,5 @@ file(MAKE_DIRECTORY ${INSTALL_DIR}/include) add_library(gtest SHARED IMPORTED GLOBAL) add_dependencies(gtest GoogleTest) set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgtest.so) -#set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgtest_main.so) set_property(TARGET gtest PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) set_property(TARGET gtest PROPERTY INTERFACE_LINK_LIBRARIES pthread) |