wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: apply suggestions from code review

Browse Source 
Co-Authored-By: Anonymous Maarten <madebr@users.noreply.github.com>
This commit is contained in:
Carlos Gomes Martinho 2020-04-01 22:38:53 +02:00 committed by GitHub
parent 989404de83
commit f3a62d560b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@ -96,19 +96,19 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/mbus/config.h.in ${CMAKE_CURRENT_LIST_D
add_library( add_library(
${PROJECT_NAME} ${PROJECT_NAME}
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.c "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.c"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.h "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.h"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.c "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.c"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.h "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.h"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.c "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.c"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.h "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.h"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.c "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.c"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.h "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.h"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.c "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.c"
${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.h) "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.h")
target_include_directories( target_include_directories(
${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> ${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
target_link_libraries(${PROJECT_NAME} PRIVATE m) target_link_libraries(${PROJECT_NAME} PRIVATE m)
endif() endif()
@ -165,27 +165,27 @@ set(LIBMBUS_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
install( install(
TARGETS ${PROJECT_NAME} TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}Targets EXPORT ${PROJECT_NAME}Targets
LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT lib LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT lib
ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT dev ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT dev
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT lib) RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
install( install(
EXPORT ${PROJECT_NAME}Targets EXPORT ${PROJECT_NAME}Targets
DESTINATION ${LIBMBUS_CONFIG_INSTALL_DIR} DESTINATION "${LIBMBUS_CONFIG_INSTALL_DIR}"
NAMESPACE ${PROJECT_NAME}:: NAMESPACE ${PROJECT_NAME}::
COMPONENT dev) COMPONENT dev)
configure_package_config_file(cmake/Config.cmake.in ${PROJECT_NAME}Config.cmake INSTALL_DESTINATION configure_package_config_file(cmake/Config.cmake.in ${PROJECT_NAME}Config.cmake INSTALL_DESTINATION
${LIBMBUS_CONFIG_INSTALL_DIR}) "${LIBMBUS_CONFIG_INSTALL_DIR}")
write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake COMPATIBILITY SameMajorVersion) write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake COMPATIBILITY SameMajorVersion)
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
DESTINATION ${LIBMBUS_CONFIG_INSTALL_DIR} DESTINATION "${LIBMBUS_CONFIG_INSTALL_DIR}"
COMPONENT dev) COMPONENT dev)
install( install(
DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/mbus/ DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/mbus/"
DESTINATION ${INSTALL_INC_DIR} DESTINATION "${INSTALL_INC_DIR}"
COMPONENT dev COMPONENT dev
FILES_MATCHING FILES_MATCHING
PATTERN "*.h") PATTERN "*.h")