From 52be8468d29788e1952db0f89263a111fa15394a Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Tue, 2 May 2023 22:23:58 -0400 Subject: Use vcpkg --- .gitmodules | 3 +++ CMakeLists.txt | 5 ++--- vcpkg.json | 7 +++++++ vendor/vcpkg | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 vcpkg.json create mode 160000 vendor/vcpkg diff --git a/.gitmodules b/.gitmodules index 39f13d2..121a775 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "vendor/asio"] path = vendor/asio url = https://github.com/chriskohlhoff/asio/ +[submodule "vendor/vcpkg"] + path = vendor/vcpkg + url = https://github.com/Microsoft/vcpkg.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 399060b..756c776 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,8 @@ set(CMAKE_BUILD_TYPE Debug) find_package(wxWidgets COMPONENTS core base) include(${wxWidgets_USE_FILE}) -find_package(PkgConfig) -pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) -pkg_check_modules(openssl openssl REQUIRED) +find_package(OpenSSL) +find_package(yaml-cpp) include_directories( vendor/hkutil diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..8ba54b0 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,7 @@ +{ + "dependencies": [ + "wxwidgets", + "openssl", + "yaml-cpp" + ] +} diff --git a/vendor/vcpkg b/vendor/vcpkg new file mode 160000 index 0000000..6d69bba --- /dev/null +++ b/vendor/vcpkg @@ -0,0 +1 @@ +Subproject commit 6d69bbacd2fbeae957f034dbbd2b454b5e3941fe -- cgit 1.4.1