early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,53 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea9fd15..af63d1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
# Include cmake modules
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+# list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(GenerateExportHeader)
diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
index aa37eda..d29176a 100644
--- a/source/cppfs/CMakeLists.txt
+++ b/source/cppfs/CMakeLists.txt
@@ -4,18 +4,18 @@
#
find_package(LibSSH2)
-find_package(LibCrypto)
+# find_package(LibCrypto)
find_package(ZLIB)
find_package(OpenSSL)
-if (LibSSH2_FOUND AND LibCrypto_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND)
+if (LibSSH2_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND)
set(SSH_DEPS_MET TRUE)
else()
set(SSH_DEPS_MET FALSE)
endif()
if (OPTION_BUILD_SSH_BACKEND AND NOT SSH_DEPS_MET)
- message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, LibCrypto: ${LibCrypto_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}")
+ message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}")
endif()
@@ -207,10 +207,9 @@ target_link_libraries(${target}
if (OPTION_BUILD_SSH_BACKEND)
target_link_libraries(${target}
PRIVATE
- ${OPENSSL_LIBRARIES}
- ${LIBSSH2_LIBRARY}
- ${LIBCRYPTO_LIBRARY}
- ${ZLIB_LIBRARY}
+ Libssh2::libssh2
+ OpenSSL::SSL OpenSSL::Crypto
+ ZLIB::ZLIB
)
if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")

View File

@@ -0,0 +1,46 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea9fd15..c62c6fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ endif()
if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL)
# Install into the system (/usr/bin or /usr/local/bin)
set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>
- set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
+ set(INSTALL_CMAKE "share/${project}") # /usr/[local]/share/<project>
set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/<project>
set(INSTALL_DATA "share/${project}") # /usr/[local]/share/<project>
set(INSTALL_BIN "bin") # /usr/[local]/bin
@@ -183,7 +183,7 @@ add_subdirectory(deploy)
install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
# Install cmake find script for the project
-install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
+# install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
# Install the project meta files
install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
index aa37eda..e8a59e0 100644
--- a/source/cppfs/CMakeLists.txt
+++ b/source/cppfs/CMakeLists.txt
@@ -283,7 +283,7 @@ perform_health_checks(
# Library
install(TARGETS ${target}
- EXPORT "${target}-export" COMPONENT dev
+ EXPORT "${target}-config" COMPONENT dev
RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime
LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime
ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev
@@ -302,8 +302,8 @@ install(DIRECTORY
)
# CMake config
-install(EXPORT ${target}-export
+install(EXPORT ${target}-config
NAMESPACE ${META_PROJECT_NAME}::
- DESTINATION ${INSTALL_CMAKE}/${target}
+ DESTINATION ${INSTALL_CMAKE}
COMPONENT dev
)

40
externals/vcpkg/ports/cppfs/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,40 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cginternals/cppfs
REF 156d72e2cf0a9b12bdce369fc5b5d98fb5dffe2d # v1.3.0
SHA512 da1e09f79d9e65e7676784f47196645aabe1e1284f0ea5e48e845a244f5d49f5ea4b032f9e2e38c8e6a29657ebe636c9b1c9a4601c4bbc7637e7f592c52a8961
HEAD_REF master
PATCHES
LibCrypto-fix.patch
cmake-export-fix.patch
)
if(${TARGET_TRIPLET} MATCHES "uwp")
message(FATAL_ERROR "cppfs does not support uwp")
endif()
set(SSH_BACKEND OFF)
if("ssh" IN_LIST FEATURES)
set(SSH_BACKEND ON)
if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64")
message(FATAL_ERROR "SSH backend of cppfs does not support arm64.")
endif()
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DOPTION_BUILD_SSH_BACKEND=${SSH_BACKEND}
-DOPTION_BUILD_TESTS=Off
-DOPTION_FORCE_SYSTEM_DIR_INSTALL=On
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppfs RENAME copyright)

17
externals/vcpkg/ports/cppfs/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,17 @@
{
"name": "cppfs",
"version-string": "1.3.0",
"port-version": 1,
"description": "Cross-platform C++ file system library supporting multiple backends",
"supports": "!uwp",
"features": {
"ssh": {
"description": "SSH backend for cppfs",
"dependencies": [
"libssh2",
"openssl",
"zlib"
]
}
}
}