blob: 13618d7e9631a0f0e9fd36fc206f050c6f524b44 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- a/CMake/FindLuaInterp.cmake 2016-07-15 02:29:39.418795763 +0800
+++ b/CMake/FindLuaInterp.cmake 2016-07-15 02:29:45.812129311 +0800
@@ -11,7 +11,7 @@
# LUA_EXECUTABLE_VERSION_STRING - version of lua found
find_program(LUA_EXECUTABLE
- NAMES lua
+ NAMES lua5.1 lua
)
if(LUA_EXECUTABLE)
--- a/Wrapping/Lua/CMakeLists.txt 2016-07-15 02:21:14.748778896 +0800
+++ Wrapping/Lua/CMakeLists.txt.orig 2016-07-15 02:20:55.322111581 +0800
@@ -5,14 +5,7 @@
include(../../CMake/sitkProjectLanguageCommon.cmake)
-if (CMAKE_VERSION VERSION_LESS "3")
- find_package ( Lua51 ${_QUIET} )
- if ( NOT LUA_FOUND )
- find_package ( Lua50 ${_QUIET} )
- endif()
-else()
- find_package ( Lua ${_QUIET} )
-endif()
+find_package ( Lua51 ${_QUIET} )
set( LUA_ADDITIONAL_LIBRARIES "" CACHE STRING "Additional libraries which may be needed for lua executable such as readline.")
mark_as_advanced( LUA_ADDITIONAL_LIBRARIES )
--- a/CMake/sitkLanguageOptions.cmake 2016-07-15 17:56:50.830654990 +0800
+++ b/CMake/sitkLanguageOptions.cmake 2016-07-15 17:57:23.547322749 +0800
@@ -31,15 +31,8 @@
# Setup the option for each language
#
set_QUIET( WRAP_LUA )
-if (CMAKE_VERSION VERSION_LESS "3")
- find_package ( Lua51 ${_QUIET} )
- if ( NOT LUA_FOUND )
- find_package ( Lua50 ${_QUIET} )
- endif()
-else()
- find_package ( Lua ${_QUIET} )
-endif()
-if ( LUA_FOUND )
+find_package ( Lua51 ${_QUIET} )
+if ( LUA51_FOUND )
set( WRAP_LUA_DEFAULT ON )
else()
set( WRAP_LUA_DEFAULT OFF )
|