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

Stylistic CMake changes

Browse source 
No functional impact intended
Signed-off-by: Dan Rose <dan@digilabs.io>
This commit is contained in:
Dan Rose 2019-10-21 22:35:35 -05:00 • committed by eboasson
parent 418a70e7c3
commit 98ce7d1971
3 changed files with 12 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/core/ddsc/CMakeLists.txt
View file

@ -87,11 +87,6 @@ generate_export_header(
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/include/dds/export.h" EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/include/dds/export.h"
) )
target_include_directories(
ddsc PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
target_sources(ddsc target_sources(ddsc
PRIVATE PRIVATE
${srcs_ddsc} ${srcs_ddsc}
@ -103,27 +98,21 @@ target_sources(ddsc
target_include_directories(ddsc target_include_directories(ddsc
PUBLIC PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
PRIVATE PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/src") "${CMAKE_CURRENT_LIST_DIR}/src"
INTERFACE
target_include_directories(ddsc INTERFACE $<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
install( install(
DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/dds" DIRECTORY
"${CMAKE_CURRENT_LIST_DIR}/include/"
"${CMAKE_CURRENT_BINARY_DIR}/include/"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
COMPONENT dev) COMPONENT dev)
install(
DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/ddsc"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
COMPONENT dev)
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/include/dds/export.h"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/dds"
COMPONENT dev)
# TODO: improve test inclusion. # TODO: improve test inclusion.
if((BUILD_TESTING) AND ((NOT DEFINED MSVC_VERSION) OR (MSVC_VERSION GREATER "1800"))) if((BUILD_TESTING) AND ((NOT DEFINED MSVC_VERSION) OR (MSVC_VERSION GREATER "1800")))
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/tests") add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/tests")

2
src/core/ddsi/CMakeLists.txt
View file

@ -125,7 +125,7 @@ target_include_directories(ddsc
PRIVATE "${CMAKE_CURRENT_LIST_DIR}/include") PRIVATE "${CMAKE_CURRENT_LIST_DIR}/include")
install( install(
DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/dds" DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
COMPONENT dev) COMPONENT dev)

17
src/ddsrt/CMakeLists.txt
View file

@ -260,20 +260,9 @@ if(BUILD_TESTING)
endif() endif()
install( install(
DIRECTORY "include/dds" DIRECTORY
"include/"
${CMAKE_CURRENT_BINARY_DIR}/include/
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
COMPONENT dev COMPONENT dev
FILES_MATCHING PATTERN "*.h") FILES_MATCHING PATTERN "*.h")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/include/dds/version.h"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/dds"
COMPONENT dev)
if(WIN32)
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/include/getopt.h"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
COMPONENT dev)
endif()