File tree Expand file tree Collapse file tree 5 files changed +16
-5
lines changed Expand file tree Collapse file tree 5 files changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -65,7 +65,18 @@ if(CPACK_GENERATOR)
6565 include (CPack)
6666endif ()
6767
68- add_subdirectory (cjson)
68+ if (NOT DEFINED USE_SYSTEM_DEPS)
69+ find_package (cJSON)
70+ if (NOT CJSON_FOUND)
71+ add_subdirectory (cjson)
72+ endif ()
73+ else ()
74+ if (USE_SYSTEM_DEPS)
75+ find_package (cJSON REQUIRED)
76+ else ()
77+ add_subdirectory (cjson)
78+ endif ()
79+ endif ()
6980add_subdirectory (cjson-ext )
7081add_subdirectory (euicc)
7182add_subdirectory (utils)
Original file line number Diff line number Diff line change 11add_library (cjson-ext OBJECT cjson-ext /cJSON_ex.c)
22target_include_directories (cjson-ext PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} )
3- target_link_libraries (cjson-ext PRIVATE cjson- static )
3+ target_link_libraries (cjson-ext PRIVATE ${CJSON_LIBRARY} )
44target_compile_options (cjson-ext PRIVATE -Wall -Wextra)
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ if(LPAC_DYNAMIC_DRIVERS)
1818else ()
1919 add_library (euicc-drivers STATIC ${DIR_INTERFACE_SRCS} )
2020endif ()
21- target_link_libraries (euicc-drivers euicc cjson- static lpac-utils)
21+ target_link_libraries (euicc-drivers euicc ${CJSON_LIBRARY} lpac-utils)
2222target_include_directories (euicc-drivers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} )
2323
2424target_sources (euicc-drivers PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} /apdu/stdio.c)
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ if(LPAC_DYNAMIC_LIBEUICC)
55else ()
66 add_library (euicc STATIC ${LIB_EUICC_SRCS} )
77endif ()
8- target_link_libraries (euicc cjson- static cjson-ext )
8+ target_link_libraries (euicc ${CJSON_LIBRARY} cjson-ext )
99target_include_directories (euicc PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /..>)
1010target_compile_options (euicc PRIVATE -Wall -Wextra)
1111if (LPAC_DYNAMIC_LIBEUICC)
Original file line number Diff line number Diff line change 11add_library (lpac-utils OBJECT lpac/utils.c)
22target_include_directories (lpac-utils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} )
3- target_link_libraries (lpac-utils PRIVATE cjson- static euicc)
3+ target_link_libraries (lpac-utils PRIVATE ${CJSON_LIBRARY} euicc)
44target_compile_options (lpac-utils PRIVATE -Wall -Wextra)
You can’t perform that action at this time.
0 commit comments