Browse Source

Move jessilib to Jupiter submodule

master
Jessica James 3 years ago
parent
commit
c5ca2391b3
  1. 3
      .gitmodules
  2. 2
      src/Bot/src/CMakeLists.txt
  3. 3
      src/CMakeLists.txt
  4. 2
      src/Jupiter
  5. 1
      src/jessilib

3
.gitmodules

@ -1,6 +1,3 @@
[submodule "Jupiter"] [submodule "Jupiter"]
path = src/Jupiter path = src/Jupiter
url = https://github.com/JAJames/Jupiter.git url = https://github.com/JAJames/Jupiter.git
[submodule "src/jessilib"]
path = src/jessilib
url = https://github.com/JAJames/jessilib.git

2
src/Bot/src/CMakeLists.txt

@ -15,7 +15,7 @@ add_executable(Bot ${SOURCE_FILES})
target_include_directories(Bot PUBLIC ../include) target_include_directories(Bot PUBLIC ../include)
# Setup additionally needed libs # Setup additionally needed libs
target_link_libraries(Bot jupiter jessilib) target_link_libraries(Bot jupiter)
# Enable exports # Enable exports
set_target_properties(Bot PROPERTIES set_target_properties(Bot PROPERTIES

3
src/CMakeLists.txt

@ -8,9 +8,8 @@ set(CMAKE_SHARED_LIBRARY_PREFIX)
# We need Jupiter and jessilib to be shared libs, and there aren't separate targets for shared/static variants # We need Jupiter and jessilib to be shared libs, and there aren't separate targets for shared/static variants
set(BUILD_SHARED_LIBS ON) set(BUILD_SHARED_LIBS ON)
# Add primary components (Jupiter, Bot, jessilib) # Add primary components (Jupiter, Bot)
add_subdirectory(Jupiter) add_subdirectory(Jupiter)
add_subdirectory(jessilib)
add_subdirectory(Bot) add_subdirectory(Bot)
# Setup output paths for plugins # Setup output paths for plugins

2
src/Jupiter

@ -1 +1 @@
Subproject commit b0e7aad5e3769ec8f248c123e8142f0f57f38b58 Subproject commit 1827ab0047b5dcb8e88c096457c77c9d4177bd91

1
src/jessilib

@ -1 +0,0 @@
Subproject commit 9d5d8b0abba01eaccd15d79ef63d2f7d13e94b50
Loading…
Cancel
Save