remove some duplication

Author: zerotacg

CMakeLists.txt

@@ -348,18 +348,9 @@ ENDIF()
 IF(WITH_NEL)
   IF(HUNTER_ENABLED)
     IF(WITH_GUI)
+      HUNTER_ADD_PACKAGE(Lua)
       HUNTER_ADD_PACKAGE(luabind)
       FIND_PACKAGE(Lua REQUIRED)
-      if((Lua_FOUND OR LUA_FOUND) AND NOT TARGET Lua::Lua)
-        message(FATAL_ERROR "lua target")
-        add_library(Lua::Lua INTERFACE IMPORTED)
-        set_target_properties(
-                Lua::Lua
-                PROPERTIES
-                INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
-                INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
-        )
-      endif()
       FIND_PACKAGE(Luabind REQUIRED)
     ENDIF()
 
@@ -368,15 +359,6 @@ IF(WITH_NEL)
   ELSE()
     IF(WITH_GUI)
       FIND_PACKAGE(Lua REQUIRED)
-      if((Lua_FOUND OR LUA_FOUND) AND NOT TARGET Lua::Lua)
-        add_library(Lua::Lua INTERFACE IMPORTED)
-        set_target_properties(
-                Lua::Lua
-                PROPERTIES
-                INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
-                INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
-        )
-      endif()
       FIND_PACKAGE(Luabind REQUIRED)
     ENDIF()
 

CMakeModules/FindLuabind.cmake

@@ -99,15 +99,6 @@ MACRO(FIND_CORRECT_LUA_VERSION)
       FIND_PACKAGE(Lua REQUIRED 5.0)
     ENDIF()
   ENDIF()
-  if((Lua_FOUND OR LUA_FOUND) AND NOT TARGET Lua::Lua)
-      add_library(Lua::Lua INTERFACE IMPORTED)
-      set_target_properties(
-              Lua::Lua
-              PROPERTIES
-              INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
-              INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
-      )
-  endif()
 ENDMACRO()
 
 IF(LUABIND_LIBRARIES AND LUABIND_INCLUDE_DIR)

nel/src/gui/CMakeLists.txt

@@ -8,6 +8,7 @@ add_project_library_alias(nelgui gui)
 
 TARGET_INCLUDE_DIRECTORIES(nelgui
         PRIVATE
+        ${LUA_INCLUDE_DIR}
         ${LUABIND_INCLUDE_DIR}
         ${CURL_INCLUDE_DIRS}
 )
@@ -17,7 +18,7 @@ TARGET_LINK_LIBRARIES(nelgui
         NeL::misc
         NeL::web
         NeL::3d
-        Lua::Lua
+        ${LUA_LIBRARIES}
         ${LUABIND_LIBRARIES}
         PRIVATE
         CURL::libcurl