diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | CMakeLists.txt | 5 | ||||
-rw-r--r-- | vcpkg.json | 7 | ||||
m--------- | vendor/vcpkg | 0 |
4 files changed, 12 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 39f13d2..121a775 100644 --- a/.gitmodules +++ b/.gitmodules | |||
@@ -16,3 +16,6 @@ | |||
16 | [submodule "vendor/asio"] | 16 | [submodule "vendor/asio"] |
17 | path = vendor/asio | 17 | path = vendor/asio |
18 | url = https://github.com/chriskohlhoff/asio/ | 18 | url = https://github.com/chriskohlhoff/asio/ |
19 | [submodule "vendor/vcpkg"] | ||
20 | path = vendor/vcpkg | ||
21 | 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) | |||
6 | find_package(wxWidgets COMPONENTS core base) | 6 | find_package(wxWidgets COMPONENTS core base) |
7 | include(${wxWidgets_USE_FILE}) | 7 | include(${wxWidgets_USE_FILE}) |
8 | 8 | ||
9 | find_package(PkgConfig) | 9 | find_package(OpenSSL) |
10 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | 10 | find_package(yaml-cpp) |
11 | pkg_check_modules(openssl openssl REQUIRED) | ||
12 | 11 | ||
13 | include_directories( | 12 | include_directories( |
14 | vendor/hkutil | 13 | 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 @@ | |||
1 | { | ||
2 | "dependencies": [ | ||
3 | "wxwidgets", | ||
4 | "openssl", | ||
5 | "yaml-cpp" | ||
6 | ] | ||
7 | } | ||
diff --git a/vendor/vcpkg b/vendor/vcpkg new file mode 160000 | |||
Subproject 6d69bbacd2fbeae957f034dbbd2b454b5e3941f | |||