use imported targets for lua and cpptest to automatically handle dependency settings

Author: zerotacg

CMakeLists.txt

@@ -349,13 +349,34 @@ IF(WITH_NEL)
   IF(HUNTER_ENABLED)
     IF(WITH_GUI)
       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()
 
     HUNTER_ADD_PACKAGE(CURL)
     FIND_PACKAGE(CURL CONFIG REQUIRED)
   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/FindCppTest.cmake

@@ -81,4 +81,16 @@ ELSE()
   ENDIF()
 ENDIF()
 
+
+if(CPPTEST_FOUND AND NOT TARGET CppTest::CppTest)
+  add_library(CppTest::CppTest INTERFACE IMPORTED)
+  set_target_properties(
+          CppTest::CppTest
+          PROPERTIES
+          INTERFACE_INCLUDE_DIRECTORIES "${CPPTEST_INCLUDE_DIR}"
+          INTERFACE_LINK_LIBRARIES
+          $<IF:$<AND:$<BOOL:${CPPTEST_LIBRARY_DEBUG}>,$<CONFIG:Debug>>,${CPPTEST_LIBRARY_DEBUG},${CPPTEST_LIBRARY_RELEASE}>
+  )
+endif()
+
 MARK_AS_ADVANCED(CPPTEST_LIBRARY_RELEASE CPPTEST_LIBRARY_DEBUG)

nel/src/gui/CMakeLists.txt

@@ -7,20 +7,17 @@ NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
 add_project_library_alias(nelgui gui)
 
 TARGET_INCLUDE_DIRECTORIES(nelgui
-        PUBLIC
-        $<BUILD_INTERFACE:${LUA_INCLUDE_DIR}>
-        $<INSTALL_INTERFACE:include>
         PRIVATE
         ${LUABIND_INCLUDE_DIR}
         ${CURL_INCLUDE_DIRS}
 )
 
 TARGET_LINK_LIBRARIES(nelgui
         PUBLIC
-        nelmisc
-        nelweb
-        nel3d
-        ${LUA_LIBRARIES}
+        NeL::misc
+        NeL::web
+        NeL::3d
+        Lua::Lua
         ${LUABIND_LIBRARIES}
         PRIVATE
         CURL::libcurl

nel/tools/nel_unit_test/CMakeLists.txt

@@ -3,9 +3,14 @@ ADD_EXECUTABLE(nel_unit_test
 )
 ADD_TEST(NAME nel_unit_test COMMAND nel_unit_test)
 
-TARGET_INCLUDE_DIRECTORIES(nel_unit_test PRIVATE ${CPPTEST_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(nel_unit_test
+        PRIVATE
+        CppTest::CppTest
+        NeL::misc
+        NeL::net
+        NeL::ligo
+)
 
-TARGET_LINK_LIBRARIES(nel_unit_test ${CPPTEST_LIBRARIES} nelmisc nelnet nelligo)
 NL_DEFAULT_PROPS(nel_unit_test "Unit Tests")
 NL_ADD_RUNTIME_FLAGS(nel_unit_test)
 
@@ -22,7 +27,7 @@ add_test_executable(nel_misc_config_file_test
 )
 target_link_libraries(nel_misc_config_file_test
         PRIVATE
-        nelmisc
+        NeL::misc
 )
 target_compile_definitions(nel_misc_config_file_test
         PUBLIC
@@ -35,5 +40,6 @@ add_test_executable(nel_net_module_test
 )
 target_link_libraries(nel_net_module_test
         PRIVATE
-        nelmisc nelnet
+        NeL::misc
+        NeL::net
 )