From ceb291e2360e69c23a49412de92f2ed02d5321fe Mon Sep 17 00:00:00 2001 From: Ruitard Date: Tue, 29 Nov 2022 02:21:55 +0800 Subject: [PATCH] [lua] Fix CMake LINK_INTERFACE_LIBRARIES (#28027) * [lua] Fix CMake LINK_INTERFACE_LIBRARIES * [lua] update port-version --- ports/lua/CMakeLists.txt | 10 +++++----- ports/lua/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lua.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index ac52d7e805..a63adfd8eb 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -28,10 +28,6 @@ ENDIF () IF (UNIX) ADD_DEFINITIONS (-DLUA_USE_POSIX) - FIND_LIBRARY (LIB_MATH NAMES m) - IF (LIB_MATH) - LINK_LIBRARIES (${LIB_MATH}) - ENDIF () ENDIF () # C library @@ -53,7 +49,11 @@ IF (UNIX) FIND_LIBRARY (LIB_DLOPEN NAMES dl) IF (LIB_DLOPEN) TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_USE_DLOPEN) - TARGET_LINK_LIBRARIES (lua ${LIB_DLOPEN}) + TARGET_LINK_LIBRARIES (lua ${CMAKE_DL_LIBS}) + ENDIF () + FIND_LIBRARY (LIB_MATH NAMES m) + IF (LIB_MATH) + TARGET_LINK_LIBRARIES (lua m) ENDIF () ENDIF () ENDIF () diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json index d7c7d2d57c..09a3b2844b 100644 --- a/ports/lua/vcpkg.json +++ b/ports/lua/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lua", "version": "5.4.4", - "port-version": 2, + "port-version": 3, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 1c9eab541c..dc5ed2b0ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4614,7 +4614,7 @@ }, "lua": { "baseline": "5.4.4", - "port-version": 2 + "port-version": 3 }, "lua-compat53": { "baseline": "0.10", diff --git a/versions/l-/lua.json b/versions/l-/lua.json index 5fb64a0a47..9ffd6570ff 100644 --- a/versions/l-/lua.json +++ b/versions/l-/lua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c1b2c77ce5486e3efd8d57f9fc1dbad9266df1d", + "version": "5.4.4", + "port-version": 3 + }, { "git-tree": "1443185b76c2f6e0e74c425ed0b3176e98a5fb01", "version": "5.4.4",