File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -13,7 +13,11 @@ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
1313# Project definition
1414project (evmrelay
1515 VERSION 1.0.0
16+ <<<<<<< Updated upstream
1617 DESCRIPTION "evm bridge with rlp/rlpx/discv4/discv5/eth library for C++"
18+ =======
19+ DESCRIPTION "evmrelay and rlp/rlpx/discv4/discv5/eth library for C++"
20+ >>>>>>> Stashed changes
1721 LANGUAGES C CXX
1822)
1923
@@ -51,8 +55,14 @@ set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/rlp/")
5155
5256add_subdirectory (src )
5357
58+ <<<<<<< Updated upstream
5459
5560set (evmrelay_CONFIG_DESTINATION_DIR "lib/cmake/rlp" )
61+ =======
62+ install (DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} /include" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR} /evmrelay" FILES_MATCHING PATTERN "*.h*" )
63+
64+ set (evmrelay_CONFIG_DESTINATION_DIR "lib/cmake/evmrelay" )
65+ >>>>>>> Stashed changes
5666install (EXPORT evmrelay
5767 FILE evmrelayTargets.cmake
5868 NAMESPACE evmrelay::
@@ -64,7 +74,11 @@ include(CMakePackageConfigHelpers)
6474# generate the config file that is includes the exports
6575configure_package_config_file (${CMAKE_CURRENT_SOURCE_DIR} /cmake/config.cmake.in
6676 "${CMAKE_CURRENT_BINARY_DIR} /evmrelayConfig.cmake"
77+ <<<<<<< Updated upstream
6778 INSTALL_DESTINATION ${rlp_CONFIG_DESTINATION_DIR}
79+ =======
80+ INSTALL_DESTINATION ${evmrelay_CONFIG_DESTINATION_DIR}
81+ >>>>>>> Stashed changes
6882 NO_SET_AND_CHECK_MACRO
6983 NO_CHECK_REQUIRED_COMPONENTS_MACRO
7084)
You can’t perform that action at this time.
0 commit comments