diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2ef2fc3..39a580f 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -53,9 +53,13 @@ include(ddsc/CMakeLists.txt) target_link_libraries(ddsc PRIVATE util) target_link_libraries(ddsc PRIVATE ddsrt) target_compile_definitions( - ddsc PUBLIC $>) + ddsc PUBLIC + $> + $>) target_include_directories( - ddsc PUBLIC $>) + ddsc PUBLIC + $> + $>) # SOVERSION should increase on incompatible ABI change set_target_properties(ddsc PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) diff --git a/src/core/ddsi/CMakeLists.txt b/src/core/ddsi/CMakeLists.txt index 8821665..683ad6e 100644 --- a/src/core/ddsi/CMakeLists.txt +++ b/src/core/ddsi/CMakeLists.txt @@ -78,7 +78,6 @@ PREPEND(hdrs_private_ddsi "${CMAKE_CURRENT_LIST_DIR}/include/dds/ddsi" ddsi_iid.h ddsi_tkmap.h ddsi_vendor.h - probes-constants.h q_addrset.h q_bitset.h q_bswap.h @@ -126,3 +125,8 @@ target_sources(ddsc target_include_directories(ddsc PRIVATE "${CMAKE_CURRENT_LIST_DIR}/include") + +install( + DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/dds" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + COMPONENT dev) diff --git a/src/core/ddsi/include/dds/ddsi/probes-constants.h b/src/core/ddsi/include/dds/ddsi/probes-constants.h deleted file mode 100644 index 83b15ab..0000000 --- a/src/core/ddsi/include/dds/ddsi/probes-constants.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright(c) 2006 to 2018 ADLINK Technology Limited and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License - * v. 1.0 which is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause - */ -#ifndef PROBES_CONSTANTS_H -#define PROBES_CONSTANTS_H -#define DROP_QUEUE_FULL 1 -#define DROP_TOO_OLD 2 -#define DROP_REORDER_FULL 3 -#define DROP_DUPLICATE 4 -#endif diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 4f44a70..84088c3 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -37,6 +37,11 @@ target_include_directories( "$" "$>") +install( + DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/dds" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + COMPONENT dev) + # TODO: improve test inclusion. if((BUILD_TESTING) AND ((NOT DEFINED MSVC_VERSION) OR (MSVC_VERSION GREATER "1800"))) add_subdirectory(tests)