From 0fc5c41a4925fee1b621d8298fa5ce65daa393ef Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sat, 18 Apr 2020 13:46:42 +0200 Subject: [PATCH] cmake: fix liblua platform definitions to match regular Makefile --- client/deps/lua.cmake | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/client/deps/lua.cmake b/client/deps/lua.cmake index 916d79c6f..b148d3795 100644 --- a/client/deps/lua.cmake +++ b/client/deps/lua.cmake @@ -1,26 +1,3 @@ -add_definitions(-DLUA_COMPAT_ALL $(SYSCFLAGS)) -include_directories(liblua) - -set(SYSCFLAGS "-DLUA_COMPAT_ALL") - -if (UNIX) - set(SYSCFLAGS "-DLUA_USE_LINUX") -endif (UNIX) - -if (WIN32) - set(SYSCFLAGS "-DLUA_USE_LINUX") -endif (WIN32) - -if (MINGW) - set(SYSCFLAGS "-DLUA_COMPAT_ALL $(SYSCFLAGS)") -endif (MINGW) - -if (APPLE) - set(SYSCFLAGS "-DLUA_USE_MACOSX") -endif (APPLE) - -add_definitions($(SYSCFLAGS)) - add_library(lua liblua/lapi.c liblua/lcode.c @@ -56,3 +33,13 @@ add_library(lua liblua/linit.c ) +target_compile_definitions(lua PRIVATE LUA_COMPAT_ALL) + +if (NOT MINGW) + if (APPLE) + target_compile_definitions(lua PRIVATE LUA_USE_MACOSX) + else (APPLE) + target_compile_definitions(lua PRIVATE LUA_USE_LINUX) + target_link_libraries(lua INTERFACE dl) + endif (APPLE) +endif (NOT MINGW)