From 1827ab0047b5dcb8e88c096457c77c9d4177bd91 Mon Sep 17 00:00:00 2001 From: Jessica James Date: Sun, 28 Nov 2021 11:34:12 -0600 Subject: [PATCH] Move jessilib submodule to jupiter lib --- .gitmodules | 3 +++ src/CMakeLists.txt | 3 +++ src/common/CMakeLists.txt | 1 + src/jessilib | 1 + 4 files changed, 8 insertions(+) create mode 100644 .gitmodules create mode 160000 src/jessilib diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..a950bfc --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/jessilib"] + path = src/jessilib + url = https://github.com/JAJames/jessilib.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8bc0996..25383c2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,7 @@ cmake_minimum_required(VERSION 3.0) +# Jupiter depends on jessilib, until jessilib becomes/replaces Jupiter +add_subdirectory(jessilib) + # Setup source files add_subdirectory(common) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 560bbaa..3ff2753 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -31,6 +31,7 @@ find_package(OpenSSL REQUIRED) target_link_libraries(jupiter OpenSSL::SSL OpenSSL::Crypto + jessilib ${CMAKE_DL_LIBS}) # Setup include directories diff --git a/src/jessilib b/src/jessilib new file mode 160000 index 0000000..9d5d8b0 --- /dev/null +++ b/src/jessilib @@ -0,0 +1 @@ +Subproject commit 9d5d8b0abba01eaccd15d79ef63d2f7d13e94b50