add option to not build tools

Author: knoxfighter

CMakeLists.txt

@@ -1,9 +1,14 @@
 cmake_minimum_required(VERSION 3.28)
 
-project(ArcpdsMockDummy)
-
 option(BUILD_TOOLS "Build the Collector and Mock" ON)
 
+# features that are installed via vcpkg
+if (BUILD_TOOLS)
+    list(APPEND VCPKG_MANIFEST_FEATURES "build-tools")
+endif ()
+
+project(ArcpdsMockDummy)
+
 # add project for xevtc (export xevtc.h via vcpkg)
 add_subdirectory(xevtc)
 
@@ -13,4 +18,6 @@ if (BUILD_TOOLS)
 
     add_subdirectory(arcdps_mock)
     add_subdirectory(arcdps_collector)
-endif ()
+endif ()
+
+include(library_target.cmake)

arcdps_collector/CMakeLists.txt

@@ -36,5 +36,5 @@ target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_23)
 target_link_libraries(${PROJECT_NAME} PUBLIC magic_enum::magic_enum)
 target_link_libraries(${PROJECT_NAME} PUBLIC nlohmann_json::nlohmann_json)
 target_link_libraries(${PROJECT_NAME} PUBLIC imgui::imgui)
-target_link_libraries(${PROJECT_NAME} PUBLIC ArcdpsMock)
+target_link_libraries(${PROJECT_NAME} PUBLIC ArcdpsMockXevtc)
 target_link_libraries(${PROJECT_NAME} PUBLIC ArcdpsMockLog)

arcdps_mock/CMakeLists.txt

@@ -21,6 +21,7 @@ target_compile_definitions(
         NOMINMAX
         MAGIC_ENUM_RANGE_MAX=256
 )
+target_compile_definitions(${PROJECT_NAME} PRIVATE MockProgram)
 
 # add general sources
 target_sources(${PROJECT_NAME} PUBLIC
@@ -41,5 +42,5 @@ target_link_libraries(${PROJECT_NAME} PUBLIC magic_enum::magic_enum)
 target_link_libraries(${PROJECT_NAME} PUBLIC nlohmann_json::nlohmann_json)
 target_link_libraries(${PROJECT_NAME} PUBLIC imgui::imgui)
 target_link_libraries(${PROJECT_NAME} PUBLIC Version.lib d3d11.lib Winmm.lib)
-target_link_libraries(${PROJECT_NAME} PRIVATE ArcdpsMock)
+target_link_libraries(${PROJECT_NAME} PRIVATE ArcdpsMockXevtc)
 target_link_libraries(${PROJECT_NAME} PRIVATE ArcdpsMockLog)

arcdps_mock/CombatMock.cpp

@@ -1,15 +1,20 @@
 #include "CombatMock.h"
 
 #include <ArcdpsExtension/arcdps_structs.h>
-#include "Log.h"
-#include "Xevtc.h"
+#include "../xevtc/Xevtc.h"
 
 #include <imgui/imgui.h>
 #include <atomic>
 #include <cassert>
 #include <Windows.h>
 #include <nlohmann/json.hpp>
 
+#ifdef MockProgram
+#include "Log.h"
+#else
+#define LOG(...)
+#endif
+
 using json = nlohmann::json;
 
 void CombatMock::AddAgent(const char* pAgentName, const char* pAccountName, Prof pProfession, uint32_t pElite, uint8_t pSubgroup, uint64_t pMasterUniqueId)

arcdps_mock/CombatMock.h

@@ -4,7 +4,7 @@
 
 #include <list>
 #include <map>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 

cmake/Config.cmake.in

@@ -0,0 +1,10 @@
+@PACKAGE_INIT@
+
+include ( "${CMAKE_CURRENT_LIST_DIR}/ArcdpsMockTargets.cmake" )
+
+# override Include Directories.
+# The generated Targets.cmake contains targets_sources() with BASE_DIRS, which causes the subfolder to be added to the include_directories.
+# We don't want this. The files should only be included via the subfolder: `#include <ArcdpsMock/arcdps_structs.h>`
+set_target_properties(ArcdpsMock::ArcdpsMock PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include"
+)

library_target.cmake

@@ -0,0 +1,56 @@
+project(ArcdpsMock CXX)
+
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(imgui CONFIG REQUIRED)
+find_package(magic_enum CONFIG REQUIRED)
+find_package(ArcdpsExtension CONFIG REQUIRED)
+
+add_library(${PROJECT_NAME} STATIC)
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+
+# Use -MT / -MTd runtime library
+set_property(TARGET ${PROJECT_NAME} PROPERTY
+        MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+# add general sources
+target_sources(${PROJECT_NAME} PUBLIC
+        FILE_SET HEADERS
+        FILES
+        xevtc/Xevtc.h
+        arcdps_mock/CombatMock.h
+)
+
+target_sources(${PROJECT_NAME}
+        PRIVATE
+        arcdps_mock/CombatMock.cpp
+)
+
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_23)
+
+target_link_libraries(${PROJECT_NAME} PUBLIC nlohmann_json::nlohmann_json)
+target_link_libraries(${PROJECT_NAME} PUBLIC imgui::imgui)
+target_link_libraries(${PROJECT_NAME} PUBLIC magic_enum::magic_enum)
+target_link_libraries(${PROJECT_NAME} PUBLIC ArcdpsExtension::ArcdpsExtension)
+
+include(GNUInstallDirs)
+install(TARGETS ${PROJECT_NAME}
+        EXPORT ArcdpsMockTargets
+        FILE_SET HEADERS
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+)
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/ArcdpsMockConfig.cmake
+        INSTALL_DESTINATION share/${PROJECT_NAME}
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ArcdpsMockConfig.cmake
+        DESTINATION share/${PROJECT_NAME}
+)
+
+install(EXPORT ArcdpsMockTargets
+        NAMESPACE ${PROJECT_NAME}::
+        FILE ArcdpsMockTargets.cmake
+        DESTINATION share/${PROJECT_NAME}
+)

vcpkg-configuration.json

@@ -9,7 +9,7 @@
     {
 	  "kind": "git",
 	  "repository": "https://github.com/Zinn-o-Matics/vcpkg-registry",
-	  "baseline": "6089946ca176356dc6aebec224763829b8461344",
+	  "baseline": "a98624c2db279a897c3270fad40753cae641479a",
 	  "packages": [ "arcdps-extension", "arcdps-unofficial-extras", "imgui" ]
 	}
   ]

vcpkg.json

@@ -3,15 +3,29 @@
   "name": "arcdps-mock",
   "version-string": "0.1.0",
   "dependencies": [
+    "imgui",
     {
-      "name": "imgui",
+      "name": "arcdps-extension",
+      "default-features": false,
       "features": [
-        "dx11-binding",
-        "win32-binding"
+        "imgui"
       ]
     },
-    "nlohmann-json",
-    "arcdps-extension",
-    "magic-enum"
-  ]
+    "magic-enum",
+    "nlohmann-json"
+  ],
+  "features": {
+    "build-tools": {
+      "description": "install dependencies for the tools",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "dx11-binding",
+            "win32-binding"
+          ]
+        }
+      ]
+    }
+  }
 }

xevtc/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(ArcdpsMock CXX)
+project(ArcdpsMockXevtc CXX)
 
 add_library(${PROJECT_NAME} INTERFACE)
 add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})