From f3a62d560b26bc23399415d7e2651f792f4dfa25 Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Wed, 1 Apr 2020 22:38:53 +0200 Subject: [PATCH] chore: apply suggestions from code review Co-Authored-By: Anonymous Maarten --- CMakeLists.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41cb669..a581d60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,19 +96,19 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/mbus/config.h.in ${CMAKE_CURRENT_LIST_D add_library( ${PROJECT_NAME} - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.c - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.h - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.c - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.h - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.c - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.h - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.c - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.h - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.c - ${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.h) + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.c" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.h" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.c" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.h" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.c" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.h" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.c" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.h" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.c" + "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.h") target_include_directories( - ${PROJECT_NAME} PUBLIC $ $ - $) + ${PROJECT_NAME} PUBLIC "$" "$" + "$") if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") target_link_libraries(${PROJECT_NAME} PRIVATE m) endif() @@ -165,27 +165,27 @@ set(LIBMBUS_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets - LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT lib - ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT dev - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT lib) + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT lib + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT dev + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib) install( EXPORT ${PROJECT_NAME}Targets - DESTINATION ${LIBMBUS_CONFIG_INSTALL_DIR} + DESTINATION "${LIBMBUS_CONFIG_INSTALL_DIR}" NAMESPACE ${PROJECT_NAME}:: COMPONENT dev) 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) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake - DESTINATION ${LIBMBUS_CONFIG_INSTALL_DIR} + DESTINATION "${LIBMBUS_CONFIG_INSTALL_DIR}" COMPONENT dev) install( - DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/mbus/ - DESTINATION ${INSTALL_INC_DIR} + DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/mbus/" + DESTINATION "${INSTALL_INC_DIR}" COMPONENT dev FILES_MATCHING PATTERN "*.h")