diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..578f0a1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "external/ehs"] + path = external/ehs + url = https://gitea.eventhorizonstudio.io/SilverMoonStudio/EHS.git diff --git a/CMakeLists.txt b/CMakeLists.txt index ef9bfbf..9ec75fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,8 @@ endif () set(CMAKE_CXX_STANDARD 20) +add_subdirectory(external/ehs) + add_executable(DeviceScanner main.cpp) if (IS_OS_WINDOWS) @@ -34,9 +36,6 @@ elseif (IS_OS_LINUX) add_compile_definitions(VK_USE_PLATFORM_WAYLAND_KHR EHS_WS_WAYLAND) endif() -target_link_directories(DeviceScanner PRIVATE "${USER_HOME_DIRECTORY}/.local/lib") -target_include_directories(DeviceScanner PRIVATE "${USER_HOME_DIRECTORY}/.local/include") - find_package(ZLIB REQUIRED) if (ZLIB_FOUND) message(STATUS "ZLIB was found.") diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..e3ab8f4 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "devicescanner", + "version": "1.0.0", + "dependencies" : [ "zlib", "openssl" ] +} \ No newline at end of file