From 4257d7430d077fe07b7a97f1496abcbff3c5dc0e Mon Sep 17 00:00:00 2001 From: Stefan Kieszkowski <85728496+stefankiesz@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:30:47 -0800 Subject: [PATCH] Remove Unused Dependency Files --- .gitignore | 10 +----- CMake/Dependencies/libcurl-CMakeLists.txt | 34 ------------------- CMake/Dependencies/libgtest-CMakeLists.txt | 17 ---------- CMake/Dependencies/libjsmn-CMakeLists.txt | 14 -------- .../Dependencies/libjsmn-add-cmakelists.patch | 17 ---------- CMake/Dependencies/libopenssl-CMakeLists.txt | 31 ----------------- CMake/FindJsmn.cmake | 9 ----- CMake/Utilities.cmake | 5 --- 8 files changed, 1 insertion(+), 136 deletions(-) delete mode 100644 CMake/Dependencies/libcurl-CMakeLists.txt delete mode 100644 CMake/Dependencies/libgtest-CMakeLists.txt delete mode 100644 CMake/Dependencies/libjsmn-CMakeLists.txt delete mode 100644 CMake/Dependencies/libjsmn-add-cmakelists.patch delete mode 100644 CMake/Dependencies/libopenssl-CMakeLists.txt delete mode 100644 CMake/FindJsmn.cmake diff --git a/.gitignore b/.gitignore index b4dc61e3..344cba85 100644 --- a/.gitignore +++ b/.gitignore @@ -6,16 +6,8 @@ build cmake-build-debug/ cmake-build-release/ doc/ -open-source/libgtest -open-source/libjsmn -open-source/libopenssl -open-source/libsrtp -open-source/libusrsctp -open-source/libwebsockets -open-source/local -open-source/libautoconf +open-source/ outputs tags dependency - .vs \ No newline at end of file diff --git a/CMake/Dependencies/libcurl-CMakeLists.txt b/CMake/Dependencies/libcurl-CMakeLists.txt deleted file mode 100644 index fc2398d8..00000000 --- a/CMake/Dependencies/libcurl-CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -cmake_minimum_required(VERSION 3.6.3) - -project(libcurl-download NONE) - -find_program(MAKE_EXE NAMES make) - -if (DEFINED CMAKE_OSX_SYSROOT AND NOT CMAKE_OSX_SYSROOT STREQUAL "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot${CMAKE_OSX_SYSROOT}") -endif() - -include(ExternalProject) - -set(CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX} - -DBUILD_CURL_EXE=0 - -DHTTP_ONLY=1 - -DCMAKE_BUILD_TYPE=Release) - -# By default use openssl -if (USE_MBEDTLS) - set(CMAKE_ARGS ${CMAKE_ARGS} -DCMAKE_USE_MBEDTLS=1) -endif() - -if (WIN32) - set(CMAKE_ARGS ${CMAKE_ARGS} -DCMAKE_USE_WINSSL=1 -DCURL_STATIC_CRT=1) -endif() - -ExternalProject_Add(project_libcurl - GIT_REPOSITORY https://github.com/curl/curl.git - GIT_TAG curl-7_68_0 - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/build - CMAKE_ARGS ${CMAKE_ARGS} - BUILD_ALWAYS TRUE - TEST_COMMAND "") diff --git a/CMake/Dependencies/libgtest-CMakeLists.txt b/CMake/Dependencies/libgtest-CMakeLists.txt deleted file mode 100644 index db88fda4..00000000 --- a/CMake/Dependencies/libgtest-CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 3.6.3) - -project(libgtest-download NONE) - -include(ExternalProject) - -ExternalProject_Add(libgtest-download - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.12.1 - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/build - CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX} - -DBUILD_GMOCK=0 - -Dgtest_force_shared_crt=ON - BUILD_ALWAYS TRUE - TEST_COMMAND "" -) diff --git a/CMake/Dependencies/libjsmn-CMakeLists.txt b/CMake/Dependencies/libjsmn-CMakeLists.txt deleted file mode 100644 index b16ca0f5..00000000 --- a/CMake/Dependencies/libjsmn-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.6.3) - -project(libjsmn-download NONE) - -include(ExternalProject) -ExternalProject_Add(project_libjsmn - GIT_REPOSITORY https://github.com/zserge/jsmn.git - GIT_TAG v1.0.0 - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/build - PATCH_COMMAND git apply --ignore-whitespace ${CMAKE_SOURCE_DIR}/../../CMake/Dependencies/libjsmn-add-cmakelists.patch - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX} - BUILD_ALWAYS TRUE - TEST_COMMAND "" -) diff --git a/CMake/Dependencies/libjsmn-add-cmakelists.patch b/CMake/Dependencies/libjsmn-add-cmakelists.patch deleted file mode 100644 index 133c61d9..00000000 --- a/CMake/Dependencies/libjsmn-add-cmakelists.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..f4a1d44 ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,11 @@ -+cmake_minimum_required(VERSION 3.6.3) -+project(jsmn C) -+ -+ -+if("${CMAKE_C_COMPILER_ID}" MATCHES "GNU|Clang") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") -+endif() -+ -+add_library(jsmn STATIC jsmn.h jsmn.c) -+install(TARGETS jsmn DESTINATION lib) -+install(FILES jsmn.h DESTINATION include) diff --git a/CMake/Dependencies/libopenssl-CMakeLists.txt b/CMake/Dependencies/libopenssl-CMakeLists.txt deleted file mode 100644 index bf4edca2..00000000 --- a/CMake/Dependencies/libopenssl-CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -cmake_minimum_required(VERSION 3.6.3) - -project(libopenssl-download NONE) - -if (WIN32) - find_program(MAKE_EXE NAMES nmake) - SET(CONFIGURE_COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/Configure VC-WIN64A no-asm --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX}) -else() - find_program(MAKE_EXE NAMES make) - if (BUILD_STATIC) - SET(OPENSSL_EXTRA ${OPENSSL_EXTRA} no-shared no-dso) - endif() - - if (DEFINED BUILD_OPENSSL_PLATFORM AND NOT BUILD_OPENSSL_PLATFORM STREQUAL OFF) - SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/Configure ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX} ${BUILD_OPENSSL_PLATFORM}) - else() - SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/config ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX}) - endif() -endif() - -include(ExternalProject) -ExternalProject_Add(project_libopenssl - GIT_REPOSITORY https://github.com/openssl/openssl.git - GIT_TAG OpenSSL_1_1_1t - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/build - CONFIGURE_COMMAND ${CONFIGURE_COMMAND} - BUILD_COMMAND ${MAKE_EXE} - BUILD_IN_SOURCE TRUE - INSTALL_COMMAND ${MAKE_EXE} install_sw - TEST_COMMAND "" -) diff --git a/CMake/FindJsmn.cmake b/CMake/FindJsmn.cmake deleted file mode 100644 index fe627eee..00000000 --- a/CMake/FindJsmn.cmake +++ /dev/null @@ -1,9 +0,0 @@ -find_path(JSMN_INCLUDE_DIRS jsmn.h) - -find_library(JSMN_LIBRARY jsmn) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(JSMN DEFAULT_MSG - JSMN_LIBRARY JSMN_INCLUDE_DIRS) - -mark_as_advanced(JSMN_LIBRARY JSMN_INCLUDE_DIRS) diff --git a/CMake/Utilities.cmake b/CMake/Utilities.cmake index 560ebc3a..0bcc9166 100644 --- a/CMake/Utilities.cmake +++ b/CMake/Utilities.cmake @@ -32,11 +32,6 @@ endfunction() # build library from source function(build_dependency lib_name) set(supported_libs - gtest - jsmn - openssl - curl - mbedtls autoconf automake log4cplus)