Skip to content

Commit 31cc47e

Browse files
committed
cmake: rename make_lua_path [TO SQUASH]
1 parent dd8470c commit 31cc47e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

cmake/MakeLuaPath.cmake

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# make_lua_path provides a convenient way to define LUA_PATH and
2-
# LUA_CPATH variables.
1+
# lapi_tests_make_lua_path provides a convenient way to define
2+
# LUA_PATH and LUA_CPATH variables.
33
#
44
# Example usage:
55
#
6-
# make_lua_path(LUA_PATH
6+
# lapi_tests_make_lua_path(LUA_PATH
77
# PATH
88
# ./?.lua
99
# ${CMAKE_BINARY_DIR}/?.lua
@@ -12,14 +12,15 @@
1212
#
1313
# This will give you the string:
1414
# "./?.lua;${CMAKE_BINARY_DIR}/?.lua;${CMAKE_CURRENT_SOURCE_DIR}/?.lua;;"
15+
#
16+
# Source: https://github.com/tarantool/luajit/blob/441405c398d625fda304b16bb10f119bfd822696/cmake/MakeLuaPath.cmake
1517

16-
function(make_lua_path path)
18+
function(lapi_tests_make_lua_path path)
1719
set(prefix ARG)
1820
set(noValues)
1921
set(singleValues)
2022
set(multiValues PATHS)
2123

22-
# FIXME: if we update to CMake >= 3.5, can remove this line.
2324
include(CMakeParseArguments)
2425
cmake_parse_arguments(${prefix}
2526
"${noValues}"
@@ -38,7 +39,8 @@ function(make_lua_path path)
3839
endforeach()
3940

4041
if("${_MAKE_LUA_PATH_RESULT}" STREQUAL "")
41-
message(FATAL_ERROR "No paths are given to <make_lua_path> helper.")
42+
message(FATAL_ERROR
43+
"No paths are given to <lapi_tests_make_lua_path> helper.")
4244
endif()
4345

4446
# XXX: This is the sentinel semicolon having special meaning

tests/lapi/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ if(NOT LUA_EXECUTABLE)
55
message(FATAL_ERROR "${LUA_EXECUTABLE} is not found.")
66
endif()
77

8-
make_lua_path(LUA_CPATH
8+
lapi_tests_make_lua_path(LUA_CPATH
99
PATHS
1010
${LUZER_LUA_CPATH}
1111
)
1212

13-
make_lua_path(LUA_PATH
13+
lapi_tests_make_lua_path(LUA_PATH
1414
PATHS
1515
${LUZER_LUA_PATH}
1616
${CMAKE_CURRENT_SOURCE_DIR}/?.lua

0 commit comments

Comments
 (0)