mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-19 15:09:43 +00:00
Merge branch 'macos_lua_fix' into 'master'
make sure lua works with macos packages See merge request OpenMW/openmw!2687
This commit is contained in:
commit
15b3af92df
2 changed files with 10 additions and 1 deletions
|
@ -1,5 +1,10 @@
|
||||||
project (Components)
|
project (Components)
|
||||||
|
|
||||||
|
if(APPLE)
|
||||||
|
set(BUNDLE_RESOURCES_DIR "${APP_BUNDLE_DIR}/Contents/Resources")
|
||||||
|
set(OPENMW_RESOURCES_ROOT ${BUNDLE_RESOURCES_DIR})
|
||||||
|
endif(APPLE)
|
||||||
|
|
||||||
# Version file
|
# Version file
|
||||||
set (VERSION_IN_FILE "${OpenMW_SOURCE_DIR}/files/version.in")
|
set (VERSION_IN_FILE "${OpenMW_SOURCE_DIR}/files/version.in")
|
||||||
set (VERSION_FILE_PATH_BASE "${OpenMW_BINARY_DIR}")
|
set (VERSION_FILE_PATH_BASE "${OpenMW_BINARY_DIR}")
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
if (NOT DEFINED OPENMW_RESOURCES_ROOT)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
set(LUA_API_FILES
|
set(LUA_API_FILES
|
||||||
README.md
|
README.md
|
||||||
coroutine.doclua
|
coroutine.doclua
|
||||||
|
@ -18,5 +22,5 @@ set(LUA_API_FILES
|
||||||
)
|
)
|
||||||
|
|
||||||
foreach (f ${LUA_API_FILES})
|
foreach (f ${LUA_API_FILES})
|
||||||
copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OpenMW_BINARY_DIR}" "resources/lua_api/${f}")
|
copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/lua_api/${f}")
|
||||||
endforeach (f)
|
endforeach (f)
|
||||||
|
|
Loading…
Reference in a new issue