cmake: get rid of LUA_TARGET

Required for setting a Lua library outside.

Author: ligurio

cmake/BuildLua.cmake

@@ -59,7 +59,7 @@ macro(build_lua LUA_VERSION)
 
     include(ExternalProject)
 
-    set(LUA_LIBRARIES ${PROJECT_BINARY_DIR}/lua-${LUA_VERSION}/source/liblua.a)
+    set(LUA_LIBRARY ${PROJECT_BINARY_DIR}/lua-${LUA_VERSION}/source/liblua.a)
     set(LUA_EXECUTABLE ${LUA_SOURCE_DIR}/lua)
 
     ExternalProject_Add(patched-lua-${LUA_VERSION}
@@ -82,12 +82,17 @@ macro(build_lua LUA_VERSION)
                                                  LDFLAGS=${LDFLAGS}
         INSTALL_COMMAND ""
 
-        BUILD_BYPRODUCTS ${LUA_LIBRARIES} ${LUA_EXECUTABLE}
+        BUILD_BYPRODUCTS ${LUA_LIBRARY} ${LUA_EXECUTABLE}
     )
 
+    add_library(bundled-liblua STATIC IMPORTED GLOBAL)
+    set_target_properties(bundled-liblua PROPERTIES
+      IMPORTED_LOCATION ${LUA_LIBRARY})
+    add_dependencies(bundled-liblua patched-lua-${LUA_VERSION})
+
+    set(LUA_LIBRARIES bundled-liblua)
     set(LUA_INCLUDE_DIR ${PROJECT_BINARY_DIR}/lua-${LUA_VERSION}/source/)
     set(LUA_VERSION_STRING "PUC Rio Lua ${LUA_VERSION}")
-    set(LUA_TARGET patched-lua-${LUA_VERSION})
 
     unset(LUA_BINARY_DIR)
     unset(LUA_PATCH_PATH)

cmake/BuildLuaJIT.cmake

@@ -83,7 +83,7 @@ macro(build_luajit LJ_VERSION)
 
     include(ExternalProject)
 
-    set(LUA_LIBRARIES ${LJ_SOURCE_DIR}/src/libluajit.a)
+    set(LUA_LIBRARY ${LJ_SOURCE_DIR}/src/libluajit.a)
     set(LUA_EXECUTABLE ${LJ_SOURCE_DIR}/src/luajit)
 
     ExternalProject_Add(patched-luajit-${LJ_VERSION}
@@ -110,13 +110,17 @@ macro(build_luajit LJ_VERSION)
                                                  -C src
         INSTALL_COMMAND ""
 
-        BUILD_BYPRODUCTS ${LUA_LIBRARIES} ${LUA_EXECUTABLE}
+        BUILD_BYPRODUCTS ${LUA_LIBRARY} ${LUA_EXECUTABLE}
     )
 
-    set(LUA_SOURCE_DIR ${LJ_SOURCE_DIR})
+    add_library(bundled-liblua STATIC IMPORTED GLOBAL)
+    set_target_properties(bundled-liblua PROPERTIES
+      IMPORTED_LOCATION ${LUA_LIBRARY})
+    add_dependencies(bundled-liblua patched-luajit-${LJ_VERSION})
+
+    set(LUA_LIBRARIES bundled-liblua)
     set(LUA_INCLUDE_DIR ${LJ_SOURCE_DIR}/src/)
     set(LUA_VERSION_STRING "LuaJIT ${LJ_VERSION}")
-    set(LUA_TARGET patched-luajit-${LJ_VERSION})
 
     unset(LJ_SOURCE_DIR)
     unset(LJ_BINARY_DIR)

libluamut/CMakeLists.txt

@@ -12,14 +12,14 @@ add_library(${LIB_LUA_MUTATE} STATIC mutate.c)
 target_link_libraries(${LIB_LUA_MUTATE} PRIVATE ${LUA_LIBRARIES} ${LDFLAGS})
 target_include_directories(${LIB_LUA_MUTATE} PRIVATE ${LUA_INCLUDE_DIR})
 target_compile_options(${LIB_LUA_MUTATE} PRIVATE ${CFLAGS})
-add_dependencies(${LIB_LUA_MUTATE} ${LUA_TARGET})
+add_dependencies(${LIB_LUA_MUTATE} ${LUA_LIBRARIES})
 
 set(LIB_LUA_CROSSOVER lua_crossover)
 add_library(${LIB_LUA_CROSSOVER} STATIC crossover.c)
 target_link_libraries(${LIB_LUA_CROSSOVER} PRIVATE ${LUA_LIBRARIES} ${LDFLAGS})
 target_include_directories(${LIB_LUA_CROSSOVER} PRIVATE ${LUA_INCLUDE_DIR})
 target_compile_options(${LIB_LUA_CROSSOVER} PRIVATE ${CFLAGS})
-add_dependencies(${LIB_LUA_CROSSOVER} ${LUA_TARGET})
+add_dependencies(${LIB_LUA_CROSSOVER} ${LUA_LIBRARIES})
 
 if (ENABLE_INTERNAL_TESTS)
   add_subdirectory(tests)

tests/capi/CMakeLists.txt

@@ -71,7 +71,7 @@ function(create_test)
   target_link_libraries(${test_name} PUBLIC fuzzer_config ${FUZZ_LIBRARIES} ${LUA_LIBRARIES} ${LDFLAGS})
   target_include_directories(${test_name} PRIVATE ${LUA_INCLUDE_DIR})
   target_compile_options(${test_name} PRIVATE -Wall -Wextra -Wpedantic -Wno-unused-parameter -g)
-  add_dependencies(${test_name} ${LUA_TARGET})
+  add_dependencies(${test_name} ${LUA_LIBRARIES})
   string(REPLACE "_test" "" test_prefix ${test_name})
   set(LIBFUZZER_OPTS "${LIBFUZZER_OPTS} -artifact_prefix=${test_name}_")
   if (USE_LUAJIT AND (${test_name} STREQUAL "lua_dump_test"))