Use more CMake library aliases

argcracker/CMakeLists.txt

@@ -5,7 +5,11 @@ add_executable(novus-argcracker)
 target_sources(novus-argcracker PRIVATE
     src/main.cpp
     src/tickcount.cpp)
-target_link_libraries(novus-argcracker PRIVATE Qt6::Core Qt6::Core5Compat physis z)
+target_link_libraries(novus-argcracker
+        PRIVATE
+        Physis::Physis
+        Qt6::Core
+        Qt6::Core5Compat)
 target_include_directories(novus-argcracker PUBLIC include)
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")

armoury/CMakeLists.txt

@@ -29,17 +29,17 @@ target_include_directories(novus-armoury
         include
         PRIVATE
         ${CMAKE_BINARY_DIR})
-target_link_libraries(novus-armoury PUBLIC
+target_link_libraries(novus-armoury
+        PUBLIC
+        Novus::Common
+        Novus::MdlPart
+        Novus::CmpPart
+        Novus::SklbPart
+        Physis::Physis
+        Physis::Logger
+        imgui
         Qt6::Core
         Qt6::Widgets
-        Qt6::Concurrent
+        Qt6::Concurrent)
-        physis
-        z
-        physis-logger
-        mdlpart
-        cmppart
-        sklbpart
-        imgui
-        novus-common)
 
 install(TARGETS novus-armoury ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS})

common/CMakeLists.txt

@@ -19,4 +19,13 @@ target_include_directories(novus-common PUBLIC
         include
         PRIVATE
         ${CMAKE_BINARY_DIR})
-target_link_libraries(novus-common PUBLIC Qt6::Core Qt6::Widgets KF6::CoreAddons KF6::ConfigCore KF6::XmlGui physis)
+target_link_libraries(novus-common
+        PUBLIC
+        Physis::Physis
+        KF6::CoreAddons
+        KF6::ConfigCore
+        KF6::XmlGui
+        Qt6::Core
+        Qt6::Widgets)
+
+add_library(Novus::Common ALIAS novus-common)

extern/CMakeLists.txt

@@ -9,7 +9,10 @@ corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/Cargo
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libphysis/logger)
 
 target_include_directories(physis INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/target/public)
-target_link_libraries(physis INTERFACE unshield)
+target_link_libraries(physis INTERFACE unshield z)
+
+add_library(Physis::Physis ALIAS physis)
+add_library(Physis::Logger ALIAS physis-logger)
 
 add_subdirectory(magic_enum EXCLUDE_FROM_ALL)
 add_subdirectory(tinygltf EXCLUDE_FROM_ALL)

karuku/CMakeLists.txt

@@ -9,6 +9,13 @@ target_include_directories(novus-karuku
         PUBLIC
         include)
 
-target_link_libraries(novus-karuku PRIVATE physis physis-logger z Qt6::Core Qt6::Widgets exdpart novus-common)
+target_link_libraries(novus-karuku
+        PRIVATE
+        Novus::Common
+        Novus::ExdPart
+        Physis::Physis
+        Physis::Logger
+        Qt6::Core
+        Qt6::Widgets)
 
 install(TARGETS novus-karuku ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS})

launcher/CMakeLists.txt

@@ -5,5 +5,10 @@ add_executable(novus-launcher)
 target_sources(novus-launcher PRIVATE
         src/main.cpp
         src/mainwindow.cpp)
-target_link_libraries(novus-launcher PRIVATE Qt6::Widgets KF6::ConfigCore physis z novus-common)
+target_link_libraries(novus-launcher
+        PRIVATE
+        Novus::Common
+        Physis::Physis
+        KF6::ConfigCore
+        Qt6::Widgets)
 target_include_directories(novus-launcher PUBLIC include)

mdlviewer/CMakeLists.txt

@@ -8,6 +8,14 @@ target_sources(novus-mdlviewer PRIVATE
 target_include_directories(novus-mdlviewer
         PUBLIC
         include)
-target_link_libraries(novus-mdlviewer PRIVATE physis physis-logger z Qt6::Core Qt6::Widgets KF6::XmlGui mdlpart novus-common)
+target_link_libraries(novus-mdlviewer
+        PRIVATE
+        Novus::MdlPart
+        Novus::Common
+        Physis::Physis
+        Physis::Logger
+        KF6::XmlGui
+        Qt6::Core
+        Qt6::Widgets)
 
 install(TARGETS novus-mdlviewer ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS})

parts/cmp/CMakeLists.txt

@@ -5,5 +5,12 @@ add_library(cmppart STATIC)
 target_sources(cmppart PRIVATE
         cmppart.cpp
         cmppart.h)
-target_link_libraries(cmppart PUBLIC magic_enum physis z Qt6::Core Qt6::Widgets)
+target_link_libraries(cmppart
+        PUBLIC
+        Physis::Physis
+        magic_enum
+        Qt6::Core
+        Qt6::Widgets)
 target_include_directories(cmppart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(Novus::CmpPart ALIAS cmppart)

parts/exd/CMakeLists.txt

@@ -3,5 +3,11 @@
 
 add_library(exdpart STATIC)
 target_sources(exdpart PRIVATE exdpart.cpp)
-target_link_libraries(exdpart PUBLIC physis z Qt6::Core Qt6::Widgets)
+target_link_libraries(exdpart
+        PUBLIC
+        Physis::Physis
+        Qt6::Core
+        Qt6::Widgets)
 target_include_directories(exdpart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(Novus::ExdPart ALIAS exdpart)

parts/exl/CMakeLists.txt

@@ -3,5 +3,11 @@
 
 add_library(exlpart STATIC)
 target_sources(exlpart PRIVATE exlpart.cpp)
-target_link_libraries(exlpart PUBLIC physis z Qt6::Core Qt6::Widgets)
+target_link_libraries(exlpart
+        PUBLIC
+        Physis::Physis
+        Qt6::Core
+        Qt6::Widgets)
 target_include_directories(exlpart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(Novus::ExlPart ALIAS exlpart)

parts/hex/CMakeLists.txt

@@ -21,5 +21,11 @@ target_sources(hexpart PRIVATE
         hexpart.h
         qhexview.cpp
         qhexview.h)
-target_link_libraries(hexpart PUBLIC physis Qt6::Core Qt6::Widgets)
+target_link_libraries(hexpart
+        PUBLIC
+        Physis::Physis
+        Qt6::Core
+        Qt6::Widgets)
 target_include_directories(hexpart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(Novus::HexPart ALIAS hexpart)

parts/mdl/CMakeLists.txt

@@ -12,5 +12,13 @@ target_sources(mdlpart PRIVATE
         vulkanwindow.cpp
         vulkanwindow.h
 )
-target_link_libraries(mdlpart PUBLIC physis z Qt6::Core Qt6::Widgets renderer novus-common tinygltf)
+target_link_libraries(mdlpart PUBLIC
+        Novus::Renderer
+        Novus::Common
+        Physis::Physis
+        Qt6::Core
+        Qt6::Widgets
+        tinygltf)
 target_include_directories(mdlpart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(Novus::MdlPart ALIAS mdlpart)

parts/shpk/CMakeLists.txt

@@ -7,6 +7,15 @@ find_package(SPIRV-Headers REQUIRED)
 
 add_library(shpkpart STATIC)
 target_sources(shpkpart PRIVATE shpkpart.cpp)
-target_link_libraries(shpkpart PUBLIC physis z dxbc spirv-cross-core spirv-cross-glsl Qt6::Core Qt6::Widgets novus-common)
+target_link_libraries(shpkpart PUBLIC
+        Novus::Common
+        Physis::Physis
+        dxbc
+        spirv-cross-core
+        spirv-cross-glsl
+        Qt6::Core
+        Qt6::Widgets)
 target_include_directories(shpkpart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_options(shpkpart PRIVATE -fexceptions)
+
+add_library(Novus::ShpkPart ALIAS shpkpart)

parts/sklb/CMakeLists.txt

@@ -5,5 +5,12 @@ add_library(sklbpart STATIC)
 target_sources(sklbpart PRIVATE
         sklbpart.cpp
         sklbpart.h)
-target_link_libraries(sklbpart PUBLIC novus-common physis z Qt6::Core Qt6::Widgets)
+target_link_libraries(sklbpart
+        PUBLIC
+        Novus::Common
+        Physis::Physis
+        Qt6::Core
+        Qt6::Widgets)
 target_include_directories(sklbpart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(Novus::SklbPart ALIAS sklbpart)

parts/tex/CMakeLists.txt

@@ -7,5 +7,11 @@ target_sources(texpart PRIVATE
         imagelabel.h
         texpart.cpp
         texpart.h)
-target_link_libraries(texpart PUBLIC physis z Qt6::Core Qt6::Widgets)
+target_link_libraries(texpart
+        PUBLIC
+        Physis::Physis
+        Qt6::Core
+        Qt6::Widgets)
 target_include_directories(texpart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(Novus::TexPart ALIAS texpart)

renderer/CMakeLists.txt

@@ -14,5 +14,12 @@ qt_add_resources(renderer "shaders"
         shaders/mesh.frag.spv
         shaders/mesh.vert.spv)
 target_include_directories(renderer PUBLIC include)
-target_link_libraries(renderer PUBLIC Qt6::Core Vulkan::Vulkan physis z glm::glm imgui)
+target_link_libraries(renderer PUBLIC
+        Qt6::Core
+        Vulkan::Vulkan
+        Physis::Physis
+        glm::glm
+        imgui)
 target_compile_definitions(renderer PUBLIC GLM_FORCE_RADIANS GLM_FORCE_DEPTH_ZERO_TO_ONE)
+
+add_library(Novus::Renderer ALIAS renderer)

sagasu/CMakeLists.txt

@@ -5,13 +5,21 @@ add_library(novus-sagasu-static STATIC)
 target_sources(novus-sagasu-static PRIVATE
         include/hashdatabase.h
         src/hashdatabase.cpp)
-target_link_libraries(novus-sagasu-static PUBLIC physis z Qt6::Core Qt6::Sql novus-common)
+target_link_libraries(novus-sagasu-static
+        PUBLIC
+        Novus::Common
+        Physis::Physis
+        Qt6::Core
+        Qt6::Sql)
 target_include_directories(novus-sagasu-static PRIVATE include)
 
 add_executable(novus-sagasu-indexer)
 target_sources(novus-sagasu-indexer PRIVATE
         src/indexer.cpp)
-target_link_libraries(novus-sagasu-indexer PRIVATE Qt6::HttpServer novus-sagasu-static)
+target_link_libraries(novus-sagasu-indexer
+        PRIVATE
+        novus-sagasu-static
+        Qt6::HttpServer)
 target_include_directories(novus-sagasu-indexer PRIVATE include)
 
 add_executable(novus-sagasu)
@@ -22,6 +30,18 @@ target_sources(novus-sagasu PRIVATE
         src/filepropertieswindow.cpp
         src/filetreemodel.cpp)
 target_include_directories(novus-sagasu PRIVATE include)
-target_link_libraries(novus-sagasu PRIVATE Qt6::Concurrent physis-logger sklbpart cmppart shpkpart hexpart exlpart mdlpart exdpart texpart novus-sagasu-static)
+target_link_libraries(novus-sagasu
+        PRIVATE
+        novus-sagasu-static
+        Novus::SklbPart
+        Novus::CmpPart
+        Novus::ShpkPart
+        Novus::HexPart
+        Novus::ExlPart
+        Novus::MdlPart
+        Novus::ExdPart
+        Novus::TexPart
+        Physis::Logger
+        Qt6::Concurrent)
 
 install(TARGETS novus-sagasu ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS})