From b446b6025d3422f0caef075d8b3c0f74bcf89470 Mon Sep 17 00:00:00 2001 From: study-faraphel Date: Thu, 2 Jan 2025 21:48:08 +0100 Subject: [PATCH] made externals modules use git external to avoid potential issues on installation --- .gitmodules | 3 +++ CMakeLists.txt | 15 ++++----------- external/argparse | 1 + 3 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 .gitmodules create mode 160000 external/argparse diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f5f9804 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "external/argparse"] + path = external/argparse + url = https://github.com/p-ranav/argparse diff --git a/CMakeLists.txt b/CMakeLists.txt index ae12486..8cce616 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,17 +6,6 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) -include(FetchContent) -find_package(PkgConfig REQUIRED) - - -FetchContent_Declare(argparse GIT_REPOSITORY https://github.com/p-ranav/argparse.git) -FetchContent_MakeAvailable(argparse) -pkg_check_modules(MPG123 REQUIRED libmpg123) -pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) -pkg_check_modules(OpenSSL REQUIRED openssl) - - add_executable(M2-PT-DRP source/main.cpp source/packets/audio/AudioPacketData.hpp @@ -90,4 +79,8 @@ target_link_libraries(M2-PT-DRP PRIVATE portaudio ssl crypto + argparse::argparse ) + + +add_subdirectory(external/argparse) \ No newline at end of file diff --git a/external/argparse b/external/argparse new file mode 160000 index 0000000..cbd9fd8 --- /dev/null +++ b/external/argparse @@ -0,0 +1 @@ +Subproject commit cbd9fd8ed675ed6a2ac1bd7142d318c6ad5d3462