Skip to content

Commit d077553

Browse files
fix (#61923) (#62186)
Co-authored-by: risemeup1 <[email protected]>
1 parent d804975 commit d077553

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

.gitmodules

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,11 @@
110110
path = third_party/cccl
111111
url = https://github.com/NVIDIA/cccl.git
112112
ignore = dirty
113+
[submodule "third_party/cryptopp"]
114+
path = third_party/cryptopp
115+
url = https://github.com/weidai11/cryptopp.git
116+
ignore = dirty
117+
[submodule "third_party/cryptopp-cmake"]
118+
path = third_party/cryptopp-cmake
119+
url = https://github.com/noloader/cryptopp-cmake.git
120+
ignore = dirty

cmake/external/cryptopp.cmake

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414

1515
include(ExternalProject)
1616

17+
set(CRYPTOPP_SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/cryptopp)
18+
set(CRYPTOPP_CMAKE_SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/cryptopp-cmake)
1719
set(CRYPTOPP_PREFIX_DIR ${THIRD_PARTY_PATH}/cryptopp)
1820
set(CRYPTOPP_INSTALL_DIR ${THIRD_PARTY_PATH}/install/cryptopp)
1921
set(CRYPTOPP_INCLUDE_DIR
2022
"${CRYPTOPP_INSTALL_DIR}/include"
2123
CACHE PATH "cryptopp include directory." FORCE)
22-
set(CRYPTOPP_REPOSITORY ${GIT_URL}/weidai11/cryptopp.git)
2324
set(CRYPTOPP_TAG CRYPTOPP_8_2_0)
2425

2526
if(WIN32)
@@ -63,17 +64,16 @@ include_directories(${CRYPTOPP_INCLUDE_DIR})
6364
ExternalProject_Add(
6465
extern_cryptopp
6566
${EXTERNAL_PROJECT_LOG_ARGS} ${SHALLOW_CLONE}
66-
GIT_REPOSITORY ${CRYPTOPP_REPOSITORY}
67-
GIT_TAG ${CRYPTOPP_TAG}
6867
PREFIX ${CRYPTOPP_PREFIX_DIR}
68+
SOURCE_DIR ${CRYPTOPP_SOURCE_DIR}
6969
UPDATE_COMMAND ""
7070
PATCH_COMMAND
71-
COMMAND ${CMAKE_COMMAND} -E remove_directory "<SOURCE_DIR>/cmake/"
72-
COMMAND git clone ${GIT_URL}/noloader/cryptopp-cmake "<SOURCE_DIR>/cmake"
73-
COMMAND cd "<SOURCE_DIR>/cmake" && git checkout tags/${CRYPTOPP_TAG} -b
74-
${CRYPTOPP_TAG}
75-
COMMAND ${CMAKE_COMMAND} -E copy_directory "<SOURCE_DIR>/cmake/"
76-
"<SOURCE_DIR>/"
71+
COMMAND ${CMAKE_COMMAND} -E copy "${CRYPTOPP_CMAKE_SOURCE_DIR}/CMakeLists.txt"
72+
"<SOURCE_DIR>/CMakeLists.txt"
73+
COMMAND
74+
${CMAKE_COMMAND} -E copy
75+
"${CRYPTOPP_CMAKE_SOURCE_DIR}/cryptopp-config.cmake"
76+
"<SOURCE_DIR>/cryptopp-config.cmake"
7777
COMMAND ${CRYPTOPP_PATCH_COMMAND}
7878
INSTALL_DIR ${CRYPTOPP_INSTALL_DIR}
7979
CMAKE_ARGS ${CRYPTOPP_CMAKE_ARGS}

third_party/cryptopp

Submodule cryptopp added at 9dcc26c

third_party/cryptopp-cmake

Submodule cryptopp-cmake added at 6d0666c

0 commit comments

Comments
 (0)