Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ if(WITH_FLOATING_POINT AND NOT WITH_FREESTANDING)
option(BUILD_TOOLS "Compile the TinyCBOR tools" ON)
endif()

# Allow disabling installation when TinyCBOR is used via add_subdirectory().
option(ENABLE_INSTALL "Install TinyCBOR files" ON)
macro(tinycbor_install)
if(ENABLE_INSTALL)
install(${ARGN})
endif()
endmacro()

# Include additional modules that are used unconditionally
include(GNUInstallDirs)
include(GenerateExportHeader)
Expand Down Expand Up @@ -184,17 +192,17 @@ target_include_directories(tinycbor
PUBLIC "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
)

install(FILES
tinycbor_install(FILES
${PROJECT_SOURCE_DIR}/src/cbor.h
${PROJECT_BINARY_DIR}/tinycbor-version.h
${PROJECT_BINARY_DIR}/tinycbor-export.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tinycbor
)
install(FILES
tinycbor_install(FILES
${CMAKE_CURRENT_BINARY_DIR}/tinycbor.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
install(
tinycbor_install(
TARGETS tinycbor
EXPORT "${TARGETS_EXPORT_NAME}"
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # import library
Expand Down
4 changes: 2 additions & 2 deletions cmake/PackageConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ write_basic_package_version_file(
COMPATIBILITY SameMinorVersion
)

install(FILES
tinycbor_install(FILES
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
COMPONENT devel
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)

if (PROJECT_LIBRARIES OR PROJECT_STATIC_LIBRARIES)
install(
tinycbor_install(
EXPORT "${TARGETS_EXPORT_NAME}"
FILE ${TARGETS_EXPORT_NAME}.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
Expand Down
2 changes: 1 addition & 1 deletion tools/cbordump/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# SPDX-License-Identifier: MIT
if(NOT WIN32)
tinycbor_add_executable(cbordump cbordump.c)
install(TARGETS cbordump)
tinycbor_install(TARGETS cbordump)
endif()
2 changes: 1 addition & 1 deletion tools/json2cbor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ if(LIBCJSON_FOUND)
tinycbor_add_executable(json2cbor json2cbor.c)
target_include_directories(json2cbor SYSTEM PUBLIC ${LIBCJSON_INCLUDE_DIRS})
target_link_libraries(json2cbor ${LIBCJSON_LIBRARIES})
install(TARGETS json2cbor)
tinycbor_install(TARGETS json2cbor)
endif()
Loading