commit 634d1be: [Minor] Fix luajit search

Vsevolod Stakhov vsevolod at highsecure.ru
Mon May 18 14:49:11 UTC 2020


Author: Vsevolod Stakhov
Date: 2020-05-18 15:42:32 +0100
URL: https://github.com/rspamd/rspamd/commit/634d1be94f92de0b0ceed06042328bd57f3bf8d0

[Minor] Fix luajit search

---
 CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d7e21ff8..388e9914f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,11 +122,14 @@ INCLUDE(OSDep)
 LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "m")
 IF(ENABLE_LUAJIT MATCHES "ON")
 	ProcessPackage(LIBLUAJIT LIBRARY	"luajit"
+										"luajit-2.1"
+										"luajit2.1"
 										"luajit-2.0"
 										"luajit2.0"
+										"luajit-5.1"
 			INCLUDE luajit.h INCLUDE_SUFFIXES
-										"include/luajit-2.0"
 										"include/luajit-2.1"
+										"include/luajit-2.0"
 										"include/luajit"
 			ROOT ${LUA_ROOT}
 			MODULES luajit)
@@ -144,7 +147,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
 			MODULES lua53
 			OPTIONAL)
 
-	IF (NOT LIBLUA_FOUND)
+	IF (NOT WITH_LIBLUA)
 		ProcessPackage(LIBLUA LIBRARY	"lua"
 				"lua-5.2"
 				INCLUDE lua.h INCLUDE_SUFFIXES
@@ -156,7 +159,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
 				MODULES lua52
 				OPTIONAL)
 
-		IF (NOT LIBLUA_FOUND)
+		IF (NOT WITH_LIBLUA)
 			ProcessPackage(LIBLUA LIBRARY	"lua"
 					"lua-5.1"
 					INCLUDE lua.h INCLUDE_SUFFIXES


More information about the Commits mailing list