diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 48 | ||||
| -rw-r--r-- | src/protocol/bus0/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/protocol/pair0/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/protocol/pair1/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/protocol/pipeline0/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/protocol/pubsub0/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/protocol/reqrep0/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/protocol/survey0/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/supplemental/util/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/transport/inproc/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/transport/ipc/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/transport/tcp/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/transport/tls/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/transport/ws/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/transport/zerotier/CMakeLists.txt | 7 |
15 files changed, 88 insertions, 71 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b245d6ae..2cf03e45 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -126,6 +126,8 @@ if (NNG_PLATFORM_WINDOWS) ) endif() +set (NNG_HEADERS nng.h) + add_subdirectory(supplemental/base64) add_subdirectory(supplemental/http) add_subdirectory(supplemental/sha1) @@ -178,35 +180,39 @@ target_compile_definitions(${PROJECT_NAME}_static PUBLIC -DNNG_STATIC_LIB) # Shared library add_library (${PROJECT_NAME} SHARED ${NNG_SOURCES}) target_compile_definitions(${PROJECT_NAME} PRIVATE -DNNG_SHARED_LIB) -#set_target_properties (${PROJECT_NAME} PROPERTIES SOVERSION "${NNG_ABI_VERSION}") + +set_target_properties (${PROJECT_NAME} + PROPERTIES SOVERSION "${NNG_ABI_VERSION}") # Set library outputs same as top-level project binary outputs -set_target_properties (${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) -set_target_properties (${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) -set_target_properties (${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +set_target_properties (${PROJECT_NAME} ${PROJECT_NAME}_static + PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +set_target_properties (${PROJECT_NAME} ${PROJECT_NAME}_static + PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +set_target_properties (${PROJECT_NAME} ${PROJECT_NAME}_static + PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) -set_target_properties (${PROJECT_NAME}_static PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) -set_target_properties (${PROJECT_NAME}_static PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) -set_target_properties (${PROJECT_NAME}_static PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +set_target_properties (${PROJECT_NAME} ${PROJECT_NAME}_static + PROPERTIES FRAMEWORK OFF) target_link_libraries (${PROJECT_NAME} ${NNG_REQUIRED_LIBRARIES}) -if( THREADS_HAVE_PTHREAD_ARG) - add_definitions (-pthread) -endif() -if (CMAKE_THREAD_LIBS_INIT) - target_link_libraries (${PROJECT_NAME} "${CMAKE_THREAD_LIBS_INIT}") -endif() +target_link_libraries (${PROJECT_NAME} Threads::Threads) -# pkg-config file -#configure_file (pkgconfig.in ${PROJECT_NAME}.pc @ONLY) -#install ( -# FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc -# DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install (TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools ) +# Install the header files. It would be much better if we could use +# the PUBLIC_HEADER facility, but it stupidly flattens the directories. +foreach (f ${NNG_HEADERS}) + get_filename_component(d ${f} DIRECTORY) + install(FILES ${f} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nng/${d} + COMPONENT headers) +endforeach() + # Promote settings to parent set(NNG_REQUIRED_LIBRARIES ${NNG_REQUIRED_LIBRARIES} PARENT_SCOPE) diff --git a/src/protocol/bus0/CMakeLists.txt b/src/protocol/bus0/CMakeLists.txt index 5071054a..06c44111 100644 --- a/src/protocol/bus0/CMakeLists.txt +++ b/src/protocol/bus0/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,7 +12,8 @@ if (NNG_PROTO_BUS0) set(BUS0_SOURCES protocol/bus0/bus.c protocol/bus0/bus.h) - install(FILES bus.h DESTINATION include/nng/protocol/bus0) + set(BUS0_HEADERS protocol/bus0/bus.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${BUS0_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${BUS0_HEADERS} PARENT_SCOPE) diff --git a/src/protocol/pair0/CMakeLists.txt b/src/protocol/pair0/CMakeLists.txt index 68e7ad34..2ba8d374 100644 --- a/src/protocol/pair0/CMakeLists.txt +++ b/src/protocol/pair0/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,7 +12,8 @@ if (NNG_PROTO_PAIR0) set(PAIR0_SOURCES protocol/pair0/pair.c protocol/pair0/pair.h) - install(FILES pair.h DESTINATION include/nng/protocol/pair0) + set(PAIR0_HEADERS protocol/pair0/pair.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${PAIR0_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${PAIR0_HEADERS} PARENT_SCOPE) diff --git a/src/protocol/pair1/CMakeLists.txt b/src/protocol/pair1/CMakeLists.txt index f35d6959..9c0ca09f 100644 --- a/src/protocol/pair1/CMakeLists.txt +++ b/src/protocol/pair1/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staystail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,7 +12,8 @@ if (NNG_PROTO_PAIR1) set(PAIR1_SOURCES protocol/pair1/pair.c protocol/pair1/pair.h) - install(FILES pair.h DESTINATION include/nng/protocol/pair1) + set(PAIR1_HEADERS protocol/pair1/pair.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${PAIR1_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${PAIR1_HEADERS} PARENT_SCOPE) diff --git a/src/protocol/pipeline0/CMakeLists.txt b/src/protocol/pipeline0/CMakeLists.txt index 6153c5a7..669fb9dc 100644 --- a/src/protocol/pipeline0/CMakeLists.txt +++ b/src/protocol/pipeline0/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,12 +12,13 @@ if (NNG_PROTO_PUSH0) set(PUSH0_SOURCES protocol/pipeline0/push.c protocol/pipeline0/push.h) - install(FILES push.h DESTINATION include/nng/protocol/pipeline0) + set(PUSH0_HEADERS protocol/pipeline0/push.h) endif() if (NNG_PROTO_PULL0) set(PULL0_SOURCES protocol/pipeline0/pull.c protocol/pipeline0/pull.h) - install(FILES pull.h DESTINATION include/nng/protocol/pipeline0) + set(PULL0_HEADERS protocol/pipeline0/pull.h) endif() -set(NNG_SOURCES ${NNG_SOURCES} ${PUSH0_SOURCES} ${PULL0_SOURCES} PARENT_SCOPE)
\ No newline at end of file +set(NNG_SOURCES ${NNG_SOURCES} ${PUSH0_SOURCES} ${PULL0_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${PUSH0_HEADERS} ${PULL0_HEADERS} PARENT_SCOPE) diff --git a/src/protocol/pubsub0/CMakeLists.txt b/src/protocol/pubsub0/CMakeLists.txt index 4edcbfae..49ec8913 100644 --- a/src/protocol/pubsub0/CMakeLists.txt +++ b/src/protocol/pubsub0/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,12 +12,13 @@ if (NNG_PROTO_PUB0) set(PUB0_SOURCES protocol/pubsub0/pub.c protocol/pubsub0/pub.h) - install(FILES pub.h DESTINATION include/nng/protocol/pubsub0) + set(PUB0_HEADERS protocol/pubsub0/pub.h) endif() if (NNG_PROTO_SUB0) set(SUB0_SOURCES protocol/pubsub0/sub.c protocol/pubsub0/sub.h) - install(FILES sub.h DESTINATION include/nng/protocol/pubsub0) + set(SUB0_HEADERS protocol/pubsub0/sub.h) endif() -set(NNG_SOURCES ${NNG_SOURCES} ${PUB0_SOURCES} ${SUB0_SOURCES} PARENT_SCOPE)
\ No newline at end of file +set(NNG_SOURCES ${NNG_SOURCES} ${PUB0_SOURCES} ${SUB0_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${PUB0_HEADERS} ${SUB0_HEADERS} PARENT_SCOPE) diff --git a/src/protocol/reqrep0/CMakeLists.txt b/src/protocol/reqrep0/CMakeLists.txt index 4e82ad41..7b04aa2d 100644 --- a/src/protocol/reqrep0/CMakeLists.txt +++ b/src/protocol/reqrep0/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,12 +12,13 @@ if (NNG_PROTO_REQ0) set(REQ0_SOURCES protocol/reqrep0/req.c protocol/reqrep0/req.h) - install(FILES req.h DESTINATION include/nng/protocol/reqrep0) + set(REQ0_HEADERS protocol/reqrep0/req.h) endif() if (NNG_PROTO_REP0) set(REP0_SOURCES protocol/reqrep0/rep.c protocol/reqrep0/rep.h) - install(FILES rep.h DESTINATION include/nng/protocol/reqrep0) + set(REP0_HEADERS protocol/reqrep0/rep.h) endif() -set(NNG_SOURCES ${NNG_SOURCES} ${REQ0_SOURCES} ${REP0_SOURCES} PARENT_SCOPE)
\ No newline at end of file +set(NNG_SOURCES ${NNG_SOURCES} ${REQ0_SOURCES} ${REP0_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${REQ0_HEADERS} ${REP0_HEADERS} PARENT_SCOPE) diff --git a/src/protocol/survey0/CMakeLists.txt b/src/protocol/survey0/CMakeLists.txt index 61e5aa7b..479c031c 100644 --- a/src/protocol/survey0/CMakeLists.txt +++ b/src/protocol/survey0/CMakeLists.txt @@ -12,12 +12,13 @@ if (NNG_PROTO_SURVEYOR0) set(SURV0_SOURCES protocol/survey0/survey.c protocol/survey0/survey.h) - install(FILES survey.h DESTINATION include/nng/protocol/survey0) + set(SURV0_HEADERS protocol/survey0/survey.h) endif() if (NNG_PROTO_RESPONDENT0) set(RESP0_SOURCES protocol/survey0/respond.c protocol/survey0/respond.h) - install(FILES respond.h DESTINATION include/nng/protocol/survey0) + set(RESP0_HEADERS protocol/survey0/respond.h) endif() -set(NNG_SOURCES ${NNG_SOURCES} ${SURV0_SOURCES} ${RESP0_SOURCES} PARENT_SCOPE)
\ No newline at end of file +set(NNG_SOURCES ${NNG_SOURCES} ${SURV0_SOURCES} ${RESP0_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${SURV0_HEADERS} ${RESP0_HEADERS} PARENT_SCOPE) diff --git a/src/supplemental/util/CMakeLists.txt b/src/supplemental/util/CMakeLists.txt index 07dba939..443473d6 100644 --- a/src/supplemental/util/CMakeLists.txt +++ b/src/supplemental/util/CMakeLists.txt @@ -8,8 +8,8 @@ # found online at https://opensource.org/licenses/MIT. # -set(SUPP_PLATFORM_SOURCES - supplemental/util/platform.c) +set(SUPP_PLATFORM_SOURCES supplemental/util/platform.c) +set(SUPP_PLATFORM_HEADERS supplemental/util/platform.h) -install(FILES platform.h DESTINATION include/nng/supplemental/util) set(NNG_SOURCES ${NNG_SOURCES} ${SUPP_PLATFORM_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${SUPP_PLATFORM_HEADERS} PARENT_SCOPE) diff --git a/src/transport/inproc/CMakeLists.txt b/src/transport/inproc/CMakeLists.txt index a445da85..7c016bce 100644 --- a/src/transport/inproc/CMakeLists.txt +++ b/src/transport/inproc/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,7 +12,8 @@ if (NNG_TRANSPORT_INPROC) set(INPROC_SOURCES transport/inproc/inproc.c transport/inproc/inproc.h) - install(FILES inproc.h DESTINATION include/nng/transport/inproc) + set(INPROC_HEADERS transport/inproc/inproc.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${INPROC_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${INPROC_HEADERS} PARENT_SCOPE) diff --git a/src/transport/ipc/CMakeLists.txt b/src/transport/ipc/CMakeLists.txt index 1a5496cf..fbae69ef 100644 --- a/src/transport/ipc/CMakeLists.txt +++ b/src/transport/ipc/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,7 +12,8 @@ if (NNG_TRANSPORT_IPC) set(IPC_SOURCES transport/ipc/ipc.c transport/ipc/ipc.h) - install(FILES ipc.h DESTINATION include/nng/transport/ipc) + set(IPC_HEADERS transport/ipc/ipc.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${IPC_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${IPC_HEADERS} PARENT_SCOPE) diff --git a/src/transport/tcp/CMakeLists.txt b/src/transport/tcp/CMakeLists.txt index 305c357a..27b62e10 100644 --- a/src/transport/tcp/CMakeLists.txt +++ b/src/transport/tcp/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,7 +12,8 @@ if (NNG_TRANSPORT_TCP) set(TCP_SOURCES transport/tcp/tcp.c transport/tcp/tcp.h) - install(FILES tcp.h DESTINATION include/nng/transport/tcp) + set(TCP_HEADERS transport/tcp/tcp.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${TCP_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${TCP_HEADERS} PARENT_SCOPE) diff --git a/src/transport/tls/CMakeLists.txt b/src/transport/tls/CMakeLists.txt index 59ff3f5e..d55a9e92 100644 --- a/src/transport/tls/CMakeLists.txt +++ b/src/transport/tls/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Staysail Systems, Inc. <info@staysail.tech> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,8 +12,8 @@ if (NNG_TRANSPORT_TLS) set(TLS_SOURCES transport/tls/tls.c transport/tls/tls.h) - install(FILES tls.h DESTINATION include/nng/transport/tls) - + set(TLS_HEADERS transport/tls/tls.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${TLS_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${TLS_HEADERS} PARENT_SCOPE) diff --git a/src/transport/ws/CMakeLists.txt b/src/transport/ws/CMakeLists.txt index 18842df9..71e2aefa 100644 --- a/src/transport/ws/CMakeLists.txt +++ b/src/transport/ws/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Staysail Systems, Inc. <info@staysail.tech> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,8 +12,8 @@ if (NNG_TRANSPORT_WS) set(WS_SOURCES transport/ws/websocket.c transport/ws/websocket.h) - install(FILES websocket.h DESTINATION include/nng/transport/ws) - + set(WS_HEADERS transport/ws/websocket.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${WS_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${WS_HEADERS} PARENT_SCOPE) diff --git a/src/transport/zerotier/CMakeLists.txt b/src/transport/zerotier/CMakeLists.txt index a4271eb7..8ca78f0f 100644 --- a/src/transport/zerotier/CMakeLists.txt +++ b/src/transport/zerotier/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2018 Capitar IT Group BV <info@capitar.com> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -45,7 +45,8 @@ if (NNG_TRANSPORT_ZEROTIER) message(STATUS "Found ZeroTier at ${NNG_LIBZTCORE}") set(ZT_SOURCES transport/zerotier/zerotier.c transport/zerotier/zerotier.h) - install(FILES zerotier.h DESTINATION include/nng/transport/zerotier) + set(ZT_HEADERS transport/zerotier/zerotier.h) endif() set(NNG_SOURCES ${NNG_SOURCES} ${ZT_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${ZT_HEADERS} PARENT_SCOPE) |
