mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-20 11:05:54 +00:00
Merge branch 'develop' into ximinez/fixed-ledger-entries
This commit is contained in:
4
.github/scripts/rename/cmake.sh
vendored
4
.github/scripts/rename/cmake.sh
vendored
@@ -81,5 +81,9 @@ elif ! grep -q '"rippled"' cmake/XrplCore.cmake; then
|
|||||||
mv cmake.tmp cmake/XrplCore.cmake
|
mv cmake.tmp cmake/XrplCore.cmake
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Remove the symlink that previously pointed from 'ripple' to 'xrpl' but now is
|
||||||
|
# no longer needed.
|
||||||
|
${SED_COMMAND} -z -i -E 's@install\(CODE.+CMAKE_INSTALL_INCLUDEDIR}/xrpl\)\n"\)@install(CODE "set(CMAKE_MODULE_PATH \\"${CMAKE_MODULE_PATH}\\")")@' cmake/XrplInstall.cmake
|
||||||
|
|
||||||
popd
|
popd
|
||||||
echo "Renaming complete."
|
echo "Renaming complete."
|
||||||
|
|||||||
@@ -37,12 +37,7 @@ install(
|
|||||||
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||||
)
|
)
|
||||||
|
|
||||||
install(CODE "
|
install(CODE "set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")")
|
||||||
set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
|
|
||||||
include(create_symbolic_link)
|
|
||||||
create_symbolic_link(xrpl \
|
|
||||||
\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/xrpl)
|
|
||||||
")
|
|
||||||
|
|
||||||
install (EXPORT XrplExports
|
install (EXPORT XrplExports
|
||||||
FILE XrplTargets.cmake
|
FILE XrplTargets.cmake
|
||||||
|
|||||||
Reference in New Issue
Block a user