-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: move all thirdparty libraries to ext directory, out of src
- Loading branch information
1 parent
30b5660
commit 4b06b2e
Showing
11 changed files
with
108 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| [submodule "src/thirdparty/bufferstream"] | ||
| path = src/thirdparty/bufferstream | ||
| [submodule "ext/bufferstream"] | ||
| path = ext/bufferstream | ||
| url = https://github.com/craftablescience/BufferStream | ||
| [submodule "src/thirdparty/cryptopp"] | ||
| path = src/thirdparty/cryptopp | ||
| [submodule "ext/cryptopp"] | ||
| path = ext/cryptopp | ||
| url = https://github.com/abdes/cryptopp-cmake | ||
| [submodule "src/thirdparty/miniz"] | ||
| path = src/thirdparty/miniz | ||
| url = https://github.com/richgel999/miniz | ||
| [submodule "src/thirdparty/minizip-ng"] | ||
| path = src/thirdparty/minizip-ng | ||
| [submodule "ext/miniz"] | ||
| path = ext/miniz | ||
| url = https://github.com/richgel999/miniz | ||
| [submodule "ext/minizip-ng"] | ||
| path = ext/minizip-ng | ||
| url = https://github.com/zlib-ng/minizip-ng |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| function(include_subdirectory SUBDIR) | ||
| cmake_parse_arguments(PARSE_ARGV 1 OPTIONS "" "" "PROPAGATE") | ||
| cmake_path(GET SUBDIR FILENAME SUBDIR_FILENAME) | ||
| include("${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/_${SUBDIR_FILENAME}.cmake") | ||
| return(PROPAGATE ${OPTIONS_PROPAGATE}) | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # bufferstream | ||
| if(NOT TARGET bufferstream) | ||
| add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/bufferstream") | ||
| endif() | ||
|
|
||
|
|
||
| # compressonator | ||
| add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/compressonator") | ||
|
|
||
|
|
||
| # cryptopp | ||
| if (NOT TARGET cryptopp::cryptopp) | ||
| set(CRYPTOPP_BUILD_TESTING OFF CACHE INTERNAL "") | ||
| set(CRYPTOPP_INSTALL OFF CACHE INTERNAL "") | ||
| add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/cryptopp") | ||
| endif() | ||
|
|
||
|
|
||
| # ice | ||
| add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/ice") | ||
|
|
||
|
|
||
| # miniz | ||
| if(NOT TARGET miniz) | ||
| add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/miniz") | ||
| endif() | ||
|
|
||
|
|
||
| # minizip-ng | ||
| if (NOT TARGET MINIZIP::minizip) | ||
| set(MZ_COMPAT OFF CACHE INTERNAL "") | ||
| set(MZ_ZLIB OFF CACHE INTERNAL "") | ||
| set(MZ_BZIP2 OFF CACHE INTERNAL "") | ||
| set(MZ_LZMA OFF CACHE INTERNAL "") | ||
| set(MZ_ZSTD OFF CACHE INTERNAL "") | ||
| set(MZ_LIBCOMP OFF CACHE INTERNAL "") | ||
| set(MZ_PKCRYPT OFF CACHE INTERNAL "") | ||
| set(MZ_WZAES OFF CACHE INTERNAL "") | ||
| set(MZ_OPENSSL OFF CACHE INTERNAL "") | ||
| set(MZ_FETCH_LIBS ON CACHE INTERNAL "") | ||
| set(MZ_FORCE_FETCH_LIBS ON CACHE INTERNAL "") | ||
| set(SKIP_INSTALL_ALL ON CACHE INTERNAL "") | ||
| add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/minizip-ng") | ||
| endif() | ||
|
|
||
|
|
||
| # stb | ||
| add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/stb") |
Submodule bufferstream
updated
from 000000 to e3786a
Submodule cryptopp
updated
from 000000 to 2c384c
Submodule minizip-ng
updated
from 000000 to fe5fed
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| list(APPEND ${PROJECT_NAME}c_SOURCES | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/lang/c/include/sourceppc/API.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/lang/c/include/sourceppc/Buffer.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/lang/c/include/sourceppc/Convert.hpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/lang/c/include/sourceppc/Helpers.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/lang/c/include/sourceppc/String.h" | ||
| "${CMAKE_CURRENT_LIST_DIR}/Buffer.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/Convert.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/String.cpp") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| add_library(${PROJECT_NAME} STATIC | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/buffer/Buffer.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/crypto/Adler32.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/crypto/CRC32.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/crypto/MD5.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/crypto/RSA.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/crypto/String.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/fs/FS.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/math/Angles.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/math/Float.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/math/Integer.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/math/Matrix.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/math/Vector.h" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/string/String.h" | ||
| "${CMAKE_CURRENT_LIST_DIR}/buffer/Buffer.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/crypto/Adler32.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/crypto/CRC32.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/crypto/MD5.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/crypto/RSA.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/crypto/String.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/fs/FS.cpp" | ||
| "${CMAKE_CURRENT_LIST_DIR}/string/String.cpp") | ||
|
|
||
| target_link_libraries(${PROJECT_NAME} PUBLIC bufferstream cryptopp::cryptopp) | ||
|
|
||
| target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") |
Submodule miniz
deleted from
8714fd