|
| 1 | +From ef1aaeee984ab13dab5d46c73e9b207cbdf62c55 Mon Sep 17 00:00:00 2001 |
| 2 | +From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= < [email protected]> |
| 3 | +Date: Wed, 20 Dec 2023 14:37:20 +0100 |
| 4 | +Subject: [PATCH] CMakeLists: do not use vendored libcurl |
| 5 | +MIME-Version: 1.0 |
| 6 | +Content-Type: text/plain; charset=UTF-8 |
| 7 | +Content-Transfer-Encoding: 8bit |
| 8 | + |
| 9 | +Upstream-Status: Inappropriate [upstream ticket https://github.com/nxp-imx/bcu/issues/17] |
| 10 | + |
| 11 | +Signed-off-by: Leonard Göhrs < [email protected]> |
| 12 | +--- |
| 13 | + CMakeLists.txt | 5 +++-- |
| 14 | + 1 file changed, 3 insertions(+), 2 deletions(-) |
| 15 | + |
| 16 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 17 | +index 3475179..bfecdb0 100644 |
| 18 | +--- a/CMakeLists.txt |
| 19 | ++++ b/CMakeLists.txt |
| 20 | +@@ -17,15 +17,16 @@ pkg_check_modules(LIBFTDI REQUIRED libftdi1) |
| 21 | + pkg_check_modules(LIBYAML REQUIRED yaml-0.1) |
| 22 | + pkg_check_modules(LIBOPENSSL REQUIRED openssl) |
| 23 | + pkg_check_modules(LIBUSB REQUIRED libusb-1.0) |
| 24 | ++pkg_check_modules(LIBCURL REQUIRED libcurl) |
| 25 | + project(bcu) |
| 26 | +-include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${PROJECT_SOURCE_DIR}/libftdi/src ${LIBYAML_INCLUDEDIR} ${PROJECT_SOURCE_DIR}/libcurl/include) |
| 27 | ++include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${LIBYAML_INCLUDEDIR}) |
| 28 | + include_directories(${PROJECT_SOURCE_DIR}) |
| 29 | + |
| 30 | + message("operation system is ${CMAKE_SYSTEM}") |
| 31 | + if (LINUX) |
| 32 | + add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c) |
| 33 | + link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS}) |
| 34 | +- target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${PROJECT_SOURCE_DIR}/libcurl/build.bcu/lib/libcurl.a -lpthread -lssl -lcrypto -lm) |
| 35 | ++ target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} -lcurl -lpthread -lssl -lcrypto -lm) |
| 36 | + execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR} |
| 37 | + COMMAND ${PROJECT_SOURCE_DIR}/build_libs.sh ${PROJECT_SOURCE_DIR}) |
| 38 | + install(TARGETS bcu DESTINATION bin) |
0 commit comments