ANDROID and WIN32 can both be set to 1, so have ANDROID take preference
authorXeli
Sat, 24 Mar 2012 16:41:35 +0100
changeset 6813 48c3462ddce9
parent 6812 929b467c7277
child 6814 21928ae7c74b
ANDROID and WIN32 can both be set to 1, so have ANDROID take preference
cmake_modules/FindLua.cmake
--- a/cmake_modules/FindLua.cmake	Sat Mar 24 15:52:07 2012 +0100
+++ b/cmake_modules/FindLua.cmake	Sat Mar 24 16:41:35 2012 +0100
@@ -1,15 +1,15 @@
 # Find the Lua library
 #
 
-IF(WIN32)
-	SET(LUA_DEFAULT lua.dll)
-ELSE(WIN32)
-	IF(APPLE)
-		SET(LUA_DEFAULT lua)
-	ELSE(APPLE)
-		if (ANDROID)
-                	SET(LUA_DEFAULT "liblua5.1.so")
-                else (ANDROID)
+if (ANDROID)
+	SET(LUA_DEFAULT "liblua5.1.so")
+else (ANDROID)
+	IF(WIN32)
+		SET(LUA_DEFAULT lua.dll)
+	ELSE(WIN32)
+		IF(APPLE)
+			SET(LUA_DEFAULT lua)
+		ELSE(APPLE)
 	                #locate the system's lua library
 			FIND_LIBRARY(LUA_DEFAULT NAMES lua51 lua5.1 lua-5.1 lua PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib)
 			IF(${LUA_DEFAULT} MATCHES "LUA_DEFAULT-NOTFOUND")
@@ -18,8 +18,8 @@
 			ENDIF()
 			#remove the path (fpc doesn't like it - why?)
 			GET_FILENAME_COMPONENT(LUA_DEFAULT ${LUA_DEFAULT} NAME)
-                ENDIF(ANDROID)
-	ENDIF(APPLE)
-ENDIF(WIN32)
+                ENDIF(APPLE
+	ENDIF(WIN32)
+ENDIF(ANDROID)
 SET(LUA_LIBRARY ${LUA_DEFAULT} CACHE STRING "Lua library to link to; file name without path only!")
 #UNSET(LUA_DEFAULT)