niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add idlc to packaging and examples

Browse source 
Signed-off-by: Dan Rose <dan@digilabs.io>
This commit is contained in:
Dan Rose 2019-10-31 17:35:57 -05:00 • committed by eboasson
parent d12b926ff1
commit bd858ea97f
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmake/Modules/Packaging.cmake
View file

@ -76,11 +76,13 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/license.txt")
# Although that does not make sense from a technical point-of-view, it # Although that does not make sense from a technical point-of-view, it
# does help to clearify which settings are required for a platform. # does help to clearify which settings are required for a platform.
set(CPACK_COMPONENTS_ALL dev lib) set(CPACK_COMPONENTS_ALL dev lib idlc)
set(CPACK_COMPONENT_LIB_DISPLAY_NAME "${PROJECT_NAME_FULL} library") set(CPACK_COMPONENT_LIB_DISPLAY_NAME "${PROJECT_NAME_FULL} library")
set(CPACK_COMPONENT_LIB_DESCRIPTION "Library used to run programs with ${PROJECT_NAME_FULL}") set(CPACK_COMPONENT_LIB_DESCRIPTION "Library used to run programs with ${PROJECT_NAME_FULL}")
set(CPACK_COMPONENT_DEV_DISPLAY_NAME "${PROJECT_NAME_FULL} development") set(CPACK_COMPONENT_DEV_DISPLAY_NAME "${PROJECT_NAME_FULL} development")
set(CPACK_COMPONENT_DEV_DESCRIPTION "Development files for use with ${PROJECT_NAME_FULL}") set(CPACK_COMPONENT_DEV_DESCRIPTION "Development files for use with ${PROJECT_NAME_FULL}")
set(CPACK_COMPONENT_IDLC_DISPLAY_NAME "${PROJECT_NAME_FULL} IDL Compiler")
set(CPACK_COMPONENT_IDLC_DESCRIPTION "Utility for turning IDL files into C++ source for ${PROJECT_NAME_FULL}")
if(WIN32 AND NOT UNIX) if(WIN32 AND NOT UNIX)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)

2
examples/helloworld/CMakeLists.export
View file

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
if (NOT TARGET CycloneDDS::ddsc) if (NOT TARGET CycloneDDS::ddsc)
# Find the CycloneDDS package. If it is not in a default location, try # Find the CycloneDDS package. If it is not in a default location, try
# finding it relative to the example where it most likely resides. # finding it relative to the example where it most likely resides.
find_package(CycloneDDS REQUIRED PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../../") find_package(CycloneDDS REQUIRED COMPONENTS idlc PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../../")
endif() endif()
# This is a convenience function, provided by the CycloneDDS package, # This is a convenience function, provided by the CycloneDDS package,

2
examples/roundtrip/CMakeLists.export
View file

@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 3.5)
if (NOT TARGET CycloneDDS::ddsc) if (NOT TARGET CycloneDDS::ddsc)
# Find the CycloneDDS package. If it is not in a default location, try # Find the CycloneDDS package. If it is not in a default location, try
# finding it relative to the example where it most likely resides. # finding it relative to the example where it most likely resides.
find_package(CycloneDDS REQUIRED PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../../") find_package(CycloneDDS REQUIRED COMPONENTS idlc PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../../")
endif() endif()
# This is a convenience function, provided by the CycloneDDS package, # This is a convenience function, provided by the CycloneDDS package,

2
examples/throughput/CMakeLists.export
View file

@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 3.5)
if (NOT TARGET CycloneDDS::ddsc) if (NOT TARGET CycloneDDS::ddsc)
# Find the CycloneDDS package. If it is not in a default location, try # Find the CycloneDDS package. If it is not in a default location, try
# finding it relative to the example where it most likely resides. # finding it relative to the example where it most likely resides.
find_package(CycloneDDS REQUIRED PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../../") find_package(CycloneDDS REQUIRED COMPONENTS idlc PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../../")
endif() endif()
# This is a convenience function, provided by the CycloneDDS package, # This is a convenience function, provided by the CycloneDDS package,