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
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.10)
project(tinycbor LANGUAGES C CXX VERSION 7.0)

# Set path to additional cmake scripts
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})

set(TARGETS_EXPORT_NAME "TinyCBOR-targets")

Expand Down Expand Up @@ -142,14 +142,14 @@ endif()

target_include_directories(tinycbor
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>"
PUBLIC "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>"
PUBLIC "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
)

install(FILES
src/cbor.h
${CMAKE_BINARY_DIR}/tinycbor-version.h
${CMAKE_BINARY_DIR}/tinycbor-export.h
${PROJECT_SOURCE_DIR}/src/cbor.h
${PROJECT_BINARY_DIR}/tinycbor-version.h
${PROJECT_BINARY_DIR}/tinycbor-export.h
TYPE INCLUDE
)
install(
Expand Down
2 changes: 1 addition & 1 deletion cmake/PackageConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
include(CMakePackageConfigHelpers)

configure_package_config_file(
"${CMAKE_SOURCE_DIR}/cmake/project-config.cmake.in"
"${PROJECT_SOURCE_DIR}/cmake/project-config.cmake.in"
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
#PATH_VARS CMAKE_INSTALL_DIR
Expand Down