kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindLua: Prefix private APIs with _lua_

Browse Source
This commit is contained in:
Ivan Ivanov 2016-06-20 20:00:32 +03:00 committed by Brad King
parent cd1f1cb544
commit 92c67b9f01
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/FindLua.cmake
View File

@ -51,32 +51,32 @@ unset(_lua_include_subdirs)
unset(_lua_library_names) unset(_lua_library_names)
# this is a function only to have all the variables inside go away automatically # this is a function only to have all the variables inside go away automatically
function(set_lua_version_vars) function(_lua_set_version_vars)
set(LUA_VERSIONS5 5.3 5.2 5.1 5.0) set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
if (Lua_FIND_VERSION_EXACT) if (Lua_FIND_VERSION_EXACT)
if (Lua_FIND_VERSION_COUNT GREATER 1) if (Lua_FIND_VERSION_COUNT GREATER 1)
set(lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}) set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
endif () endif ()
elseif (Lua_FIND_VERSION) elseif (Lua_FIND_VERSION)
# once there is a different major version supported this should become a loop # once there is a different major version supported this should become a loop
if (NOT Lua_FIND_VERSION_MAJOR GREATER 5) if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
if (Lua_FIND_VERSION_COUNT EQUAL 1) if (Lua_FIND_VERSION_COUNT EQUAL 1)
set(lua_append_versions ${LUA_VERSIONS5}) set(_lua_append_versions ${LUA_VERSIONS5})
else () else ()
foreach (subver IN LISTS LUA_VERSIONS5) foreach (subver IN LISTS LUA_VERSIONS5)
if (NOT subver VERSION_LESS ${Lua_FIND_VERSION}) if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
list(APPEND lua_append_versions ${subver}) list(APPEND _lua_append_versions ${subver})
endif () endif ()
endforeach () endforeach ()
endif () endif ()
endif () endif ()
else () else ()
# once there is a different major version supported this should become a loop # once there is a different major version supported this should become a loop
set(lua_append_versions ${LUA_VERSIONS5}) set(_lua_append_versions ${LUA_VERSIONS5})
endif () endif ()
foreach (ver IN LISTS lua_append_versions) foreach (ver IN LISTS _lua_append_versions)
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}") string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
list(APPEND _lua_include_subdirs list(APPEND _lua_include_subdirs
include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2} include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
@ -93,9 +93,9 @@ function(set_lua_version_vars)
set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE) set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE) set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
endfunction(set_lua_version_vars) endfunction(_lua_set_version_vars)
set_lua_version_vars() _lua_set_version_vars()
find_path(LUA_INCLUDE_DIR lua.h find_path(LUA_INCLUDE_DIR lua.h
HINTS HINTS