From d03783d263cacaa45ee9444d2f32a581a1801a47 Mon Sep 17 00:00:00 2001 From: jhlee525 Date: Wed, 23 Apr 2025 22:45:47 +0900 Subject: [PATCH] set public header include dir for fixing header prefix --- CMakeLists.txt | 5 ++--- {src => include/tinycbor}/cbor.h | 0 src/cborencoder.c | 2 +- src/cborencoder_close_container_checked.c | 2 +- src/cborencoder_float.c | 2 +- src/cborerrorstrings.c | 2 +- src/cborjson.h | 2 +- src/cborparser.c | 2 +- src/cborparser_dup_string.c | 2 +- src/cborparser_float.c | 2 +- src/cborpretty.c | 2 +- src/cborpretty_stdio.c | 2 +- src/cbortojson.c | 4 ++-- src/cborvalidation.c | 2 +- src/compilersupport_p.h | 2 +- tests/c90/tst_c90.c | 2 +- tests/encoder/tst_encoder.cpp | 2 +- tests/parser/tst_parser.cpp | 2 +- tests/tojson/tst_tojson.cpp | 2 +- tools/cbordump/CMakeLists.txt | 2 ++ tools/cbordump/cbordump.c | 2 +- tools/json2cbor/CMakeLists.txt | 2 ++ tools/json2cbor/json2cbor.c | 2 +- 23 files changed, 26 insertions(+), 23 deletions(-) rename {src => include/tinycbor}/cbor.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5f7f55b..296d4b1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ add_library(tinycbor src/cborparser.c src/cborpretty.c src/cborvalidation.c - src/cbor.h ) if(WITH_FREESTANDING) target_compile_options(tinycbor PUBLIC @@ -141,13 +140,13 @@ if(NOT HAVE_OPEN_MEMSTREAM) endif() target_include_directories(tinycbor - PUBLIC "$" + PUBLIC "$" PUBLIC "$" PUBLIC "$" ) install(FILES - ${PROJECT_SOURCE_DIR}/src/cbor.h + ${PROJECT_SOURCE_DIR}/include/tinycbor/cbor.h ${PROJECT_BINARY_DIR}/tinycbor-version.h ${PROJECT_BINARY_DIR}/tinycbor-export.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tinycbor diff --git a/src/cbor.h b/include/tinycbor/cbor.h similarity index 100% rename from src/cbor.h rename to include/tinycbor/cbor.h diff --git a/src/cborencoder.c b/src/cborencoder.c index ad242e30..9dd4be45 100644 --- a/src/cborencoder.c +++ b/src/cborencoder.c @@ -24,7 +24,7 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborinternal_p.h" #include "compilersupport_p.h" diff --git a/src/cborencoder_close_container_checked.c b/src/cborencoder_close_container_checked.c index fd203a85..6fed1e5a 100644 --- a/src/cborencoder_close_container_checked.c +++ b/src/cborencoder_close_container_checked.c @@ -24,7 +24,7 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" /** * \addtogroup CborEncoding diff --git a/src/cborencoder_float.c b/src/cborencoder_float.c index ff879423..e833ae2e 100644 --- a/src/cborencoder_float.c +++ b/src/cborencoder_float.c @@ -24,7 +24,7 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborinternal_p.h" diff --git a/src/cborerrorstrings.c b/src/cborerrorstrings.c index 44f766a3..d2a15b79 100644 --- a/src/cborerrorstrings.c +++ b/src/cborerrorstrings.c @@ -22,7 +22,7 @@ ** ****************************************************************************/ -#include "cbor.h" +#include "tinycbor/cbor.h" #ifndef _ # define _(msg) msg diff --git a/src/cborjson.h b/src/cborjson.h index 8ff27b92..16134c4d 100644 --- a/src/cborjson.h +++ b/src/cborjson.h @@ -25,7 +25,7 @@ #ifndef CBORJSON_H #define CBORJSON_H -#include "cbor.h" +#include "tinycbor/cbor.h" #ifdef __cplusplus extern "C" { diff --git a/src/cborparser.c b/src/cborparser.c index 31c8d8bf..5a9bfcdf 100644 --- a/src/cborparser.c +++ b/src/cborparser.c @@ -24,7 +24,7 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborinternal_p.h" #include "compilersupport_p.h" diff --git a/src/cborparser_dup_string.c b/src/cborparser_dup_string.c index 21d88c25..24e7cb20 100644 --- a/src/cborparser_dup_string.c +++ b/src/cborparser_dup_string.c @@ -24,7 +24,7 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" #include "compilersupport_p.h" #include "memory.h" diff --git a/src/cborparser_float.c b/src/cborparser_float.c index f7d0189e..7ac388c9 100644 --- a/src/cborparser_float.c +++ b/src/cborparser_float.c @@ -24,7 +24,7 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborinternal_p.h" diff --git a/src/cborpretty.c b/src/cborpretty.c index 02b5706b..cb58a2a1 100644 --- a/src/cborpretty.c +++ b/src/cborpretty.c @@ -24,7 +24,7 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborinternal_p.h" #include "compilersupport_p.h" #include "utf8_p.h" diff --git a/src/cborpretty_stdio.c b/src/cborpretty_stdio.c index 20131850..f4b591c0 100644 --- a/src/cborpretty_stdio.c +++ b/src/cborpretty_stdio.c @@ -22,7 +22,7 @@ ** ****************************************************************************/ -#include "cbor.h" +#include "tinycbor/cbor.h" #include #include diff --git a/src/cbortojson.c b/src/cbortojson.c index c48fd4d2..cf8a35dd 100644 --- a/src/cbortojson.c +++ b/src/cbortojson.c @@ -24,12 +24,12 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborjson.h" #include "cborinternal_p.h" #include "compilersupport_p.h" #include "cborinternal_p.h" -#include +#include "memory.h" #include #include diff --git a/src/cborvalidation.c b/src/cborvalidation.c index 2ad0c18c..82bccf43 100644 --- a/src/cborvalidation.c +++ b/src/cborvalidation.c @@ -24,7 +24,7 @@ #include "cborinternalmacros_p.h" -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborinternal_p.h" #include "compilersupport_p.h" #include "utf8_p.h" diff --git a/src/compilersupport_p.h b/src/compilersupport_p.h index 92517997..1261378e 100644 --- a/src/compilersupport_p.h +++ b/src/compilersupport_p.h @@ -25,7 +25,7 @@ #ifndef COMPILERSUPPORT_H #define COMPILERSUPPORT_H -#include "cbor.h" +#include "tinycbor/cbor.h" #ifndef _BSD_SOURCE # define _BSD_SOURCE diff --git a/tests/c90/tst_c90.c b/tests/c90/tst_c90.c index edb49abd..f8242474 100644 --- a/tests/c90/tst_c90.c +++ b/tests/c90/tst_c90.c @@ -22,7 +22,7 @@ ** ****************************************************************************/ -#include "cbor.h" +#include "tinycbor/cbor.h" int main() { diff --git a/tests/encoder/tst_encoder.cpp b/tests/encoder/tst_encoder.cpp index 0708064f..b296e248 100644 --- a/tests/encoder/tst_encoder.cpp +++ b/tests/encoder/tst_encoder.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include -#include "cbor.h" +#include "tinycbor/cbor.h" #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) #include diff --git a/tests/parser/tst_parser.cpp b/tests/parser/tst_parser.cpp index f9374583..43368aa1 100644 --- a/tests/parser/tst_parser.cpp +++ b/tests/parser/tst_parser.cpp @@ -25,7 +25,7 @@ #define _XOPEN_SOURCE 700 #define _DARWIN_C_SOURCE 1 /* need MAP_ANON */ #include -#include "cbor.h" +#include "tinycbor/cbor.h" #include #include diff --git a/tests/tojson/tst_tojson.cpp b/tests/tojson/tst_tojson.cpp index e1e7a76e..61b993f5 100644 --- a/tests/tojson/tst_tojson.cpp +++ b/tests/tojson/tst_tojson.cpp @@ -24,7 +24,7 @@ #define __STDC_WANT_IEC_60559_TYPES_EXT__ #include -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborinternal_p.h" #include "cborjson.h" #include diff --git a/tools/cbordump/CMakeLists.txt b/tools/cbordump/CMakeLists.txt index c03fc5ef..580e3169 100644 --- a/tools/cbordump/CMakeLists.txt +++ b/tools/cbordump/CMakeLists.txt @@ -2,5 +2,7 @@ # SPDX-License-Identifier: MIT if(NOT WIN32) tinycbor_add_executable(cbordump cbordump.c) + target_include_directories(cbordump PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) + target_link_libraries(cbordump tinycbor) install(TARGETS cbordump) endif() diff --git a/tools/cbordump/cbordump.c b/tools/cbordump/cbordump.c index df522473..3bf81301 100644 --- a/tools/cbordump/cbordump.c +++ b/tools/cbordump/cbordump.c @@ -23,7 +23,7 @@ ****************************************************************************/ #define _POSIX_C_SOURCE 200809L -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborjson.h" #include #include diff --git a/tools/json2cbor/CMakeLists.txt b/tools/json2cbor/CMakeLists.txt index 41892a3f..7948e91a 100644 --- a/tools/json2cbor/CMakeLists.txt +++ b/tools/json2cbor/CMakeLists.txt @@ -4,6 +4,8 @@ include(FindPkgConfig) pkg_check_modules(LIBCJSON libcjson) if(LIBCJSON_FOUND) tinycbor_add_executable(json2cbor json2cbor.c) + target_include_directories(json2cbor PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) target_include_directories(json2cbor SYSTEM PUBLIC ${LIBCJSON_INCLUDE_DIRS}) + target_link_directories(json2cbor PUBLIC ${LIBCJSON_LIBRARY_DIRS}) target_link_libraries(json2cbor ${LIBCJSON_LIBRARIES}) endif() diff --git a/tools/json2cbor/json2cbor.c b/tools/json2cbor/json2cbor.c index bb35108b..5751b5ed 100644 --- a/tools/json2cbor/json2cbor.c +++ b/tools/json2cbor/json2cbor.c @@ -24,7 +24,7 @@ #define _GNU_SOURCE #define __STDC_WANT_IEC_60559_TYPES_EXT__ -#include "cbor.h" +#include "tinycbor/cbor.h" #include "cborinternal_p.h" #include "compilersupport_p.h"