C9S/coopos
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

make custom_appbase as an interface so its users do not need to use relative include path in their CMakeList.txt files

Browse Source
This commit is contained in:
Lin Huang
2023-03-07 08:36:21 -05:00
parent 37f374f2d5
commit 3598fda51b
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/custom_appbase/CMakeLists.txt
+4
View File
@@ -1 +1,5 @@
add_library(custom_appbase INTERFACE)
target_include_directories(custom_appbase INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(custom_appbase INTERFACE appbase)
add_subdirectory(tests)
plugins/http_client_plugin/CMakeLists.txt
+2 -2
View File
@@ -3,5 +3,5 @@ add_library( http_client_plugin
http_client_plugin.cpp
${HEADERS} )
target_link_libraries( http_client_plugin appbase eosio_chain fc )
target_include_directories( http_client_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/custom_appbase/include" )
target_link_libraries( http_client_plugin custom_appbase eosio_chain fc )
target_include_directories( http_client_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
plugins/http_plugin/CMakeLists.txt
+2 -2
View File
@@ -3,6 +3,6 @@ add_library( http_plugin
http_plugin.cpp
${HEADERS} )
target_link_libraries( http_plugin eosio_chain appbase fc )
target_include_directories( http_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/custom_appbase/include" )
target_link_libraries( http_plugin eosio_chain custom_appbase fc )
target_include_directories( http_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
add_subdirectory( tests )
plugins/signature_provider_plugin/CMakeLists.txt
+2 -2
View File
@@ -3,5 +3,5 @@ add_library( signature_provider_plugin
signature_provider_plugin.cpp
${HEADERS} )
target_link_libraries( signature_provider_plugin appbase fc http_client_plugin )
target_include_directories( signature_provider_plugin PUBLIC include "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/custom_appbase/include" )
target_link_libraries( signature_provider_plugin custom_appbase fc http_client_plugin )
target_include_directories( signature_provider_plugin PUBLIC include )
plugins/wallet_plugin/CMakeLists.txt
+2 -2
View File
@@ -21,5 +21,5 @@ add_library( wallet_plugin
${SE_WALLET_SOURCES}
${HEADERS} )
target_link_libraries( wallet_plugin eosio_chain appbase ${security_framework} ${corefoundation_framework} ${localauthentication_framework} ${cocoa_framework})
target_include_directories( wallet_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/custom_appbase/include" )
target_link_libraries( wallet_plugin eosio_chain custom_appbase ${security_framework} ${corefoundation_framework} ${localauthentication_framework} ${cocoa_framework})
target_include_directories( wallet_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
unittests/CMakeLists.txt
+1 -2
View File
@@ -71,7 +71,7 @@ add_custom_command(
file(GLOB UNIT_TESTS "*.cpp") # find all unit test suites
add_executable( unit_test ${UNIT_TESTS} protocol_feature_digest_tests.cpp) # build unit tests as one executable
target_link_libraries( unit_test eosio_chain_wrap state_history chainbase eosio_testing fc appbase abieos ${PLATFORM_SPECIFIC_LIBS} )
target_link_libraries( unit_test eosio_chain_wrap state_history chainbase eosio_testing fc custom_appbase abieos ${PLATFORM_SPECIFIC_LIBS} )
target_compile_options(unit_test PUBLIC -DDISABLE_EOSLIB_SERIALIZE)
target_include_directories( unit_test PUBLIC
@@ -81,7 +81,6 @@ target_include_directories( unit_test PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/contracts
${CMAKE_CURRENT_BINARY_DIR}/contracts
${CMAKE_CURRENT_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/libraries/custom_appbase/include
${CMAKE_SOURCE_DIR}/plugins/http_plugin/include )
### MARK TEST SUITES FOR EXECUTION ###