StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

To quote or not to quote... that is the question

Browse Source
This commit is contained in:
ThePhD 2018-02-19 07:09:51 -05:00
parent c30d097592
commit a2e2b08ea9
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/Modules/FindLuaBuild/LuaJIT.cmake
View File

@ -248,10 +248,15 @@ elseif(LUA_JIT_NORMALIZED_LUA_VERSION MATCHES "latest")
endif() endif()
set(LUA_JIT_BYPRODUCTS "${LUA_JIT_SOURCE_LUA_LIB}" "${LUA_JIT_SOURCE_LUA_LIB_EXP}" set(LUA_JIT_BYPRODUCTS "${LUA_JIT_SOURCE_LUA_LIB}" "${LUA_JIT_SOURCE_LUA_LIB_EXP}"
"${LUA_JIT_SOURCE_LUA_DLL}" "${LUA_JIT_SOURCE_LUA_IMP_LIB}" "${LUA_JIT_SOURCE_LUA_INTERPRETER}") "${LUA_JIT_SOURCE_LUA_DLL}" "${LUA_JIT_SOURCE_LUA_INTERPRETER}")
set(LUA_JIT_INSTALL_BYPRODUCTS "${LUA_JIT_DESTINATION_LUA_INTERPRETER}" "${LUA_JIT_DESTINATION_LUA_LIB}" set(LUA_JIT_INSTALL_BYPRODUCTS "${LUA_JIT_DESTINATION_LUA_LIB}" "${LUA_JIT_DESTINATION_LUA_LIB_EXP}"
"${LUA_JIT_DESTINATION_LUA_DLL}" "${LUA_JIT_DESTINATION_LUA_LIB_EXP}" "${LUA_JIT_DESTINATION_LUA_IMP_LIB}") "${LUA_JIT_DESTINATION_LUA_DLL}" "${LUA_JIT_DESTINATION_LUA_INTERPRETER}")
if (CMAKE_IMPORT_LIBRARY_SUFFIX)
set(LUA_JIT_BYPRODUCTS "${LUA_JIT_BYPRODUCTS}" "${LUA_JIT_SOURCE_LUA_IMP_LIB}")
set(LUA_JIT_INSTALL_BYPRODUCTS "${LUA_JIT_INSTALL_BYPRODUCTS}" "${LUA_JIT_DESTINATION_LUA_IMP_LIB}")
endif()
# # Post-Build moving steps for necessary items # # Post-Build moving steps for necessary items
# Add post-step to move library afterwards # Add post-step to move library afterwards
@ -295,7 +300,7 @@ if (LUA_JIT_GIT_COMMIT OR LUA_JIT_PULL_LATEST)
${LUA_JIT_BUILD_COMMAND} ${LUA_JIT_BUILD_COMMAND}
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
BUILD_BYPRODUCTS "${LUA_JIT_BYPRODUCTS}" "${LUA_JIT_INSTALL_BYPRODUCTS}") BUILD_BYPRODUCTS ${LUA_JIT_BYPRODUCTS})
else() else()
ExternalProject_Add(LUA_JIT ExternalProject_Add(LUA_JIT
BUILD_IN_SOURCE TRUE BUILD_IN_SOURCE TRUE
@ -315,7 +320,7 @@ else()
${LUA_JIT_BUILD_COMMAND} ${LUA_JIT_BUILD_COMMAND}
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
BUILD_BYPRODUCTS "${LUA_JIT_BYPRODUCTS}") BUILD_BYPRODUCTS ${LUA_JIT_BYPRODUCTS})
endif() endif()
# # MAYBE?: # # MAYBE?:
@ -326,8 +331,7 @@ add_custom_command(TARGET LUA_JIT
POST_BUILD POST_BUILD
${LUA_JIT_POSTBUILD_COMMANDS} ${LUA_JIT_POSTBUILD_COMMANDS}
COMMENT ${LUA_JIT_POSTBUILD_COMMENTS} COMMENT ${LUA_JIT_POSTBUILD_COMMENTS}
BYPRODUCTS "${LUA_JIT_INSTALL_BYPRODUCTS}" BYPRODUCTS ${LUA_JIT_INSTALL_BYPRODUCTS})
)
# # Lua Library # # Lua Library
add_library(${lualib} ${LUA_BUILD_LIBRARY_TYPE} IMPORTED) add_library(${lualib} ${LUA_BUILD_LIBRARY_TYPE} IMPORTED)