mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 12:02:36 +02:00
Code Issues Projects Releases Wiki Activity

removed not required CURL module, renamed several cmake-build options for be more easy sortable by name

Browse Source
This commit is contained in:
filux
2015-09-27 19:46:35 +02:00
parent 4ad684deaf
commit 4bef525bf3
21 changed files with 358 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mk/cmake/Modules/FindLUA.cmake
View File

@@ -51,11 +51,12 @@
unset(_lua_include_subdirs)
unset(_lua_library_names)
IF(WANT_STATIC_LIBS)
OPTION(LUA_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
IF("${FORCE_LUA_VERSION}" STREQUAL "OFF")
SET(LUA_VERSIONS5 "${ALL_LUA_VERSIONS_IN_ORDER}")
IF(DEFINED ALL_LUA_VERSIONS_IN_ORDER)
SET(LUA_VERSIONS5 "${ALL_LUA_VERSIONS_IN_ORDER}")
ELSE()
SET(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
ENDIF()
ELSE()
SET(LUA_VERSIONS5 "${FORCE_LUA_VERSION}")
ENDIF()
@@ -91,12 +92,15 @@ function(set_lua_version_vars)
include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
)
IF(LUA_STATIC)
IF(STATIC_LUA)
list(APPEND _lua_library_names
liblua${CMAKE_MATCH_1}${CMAKE_MATCH_2}.a
liblua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
liblua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
)
lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}.a
lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
)
ENDIF()
list(APPEND _lua_library_names
lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}