diff options
| author |   tkummermehr <thorsten.kummermehr@k2l.de> | 2017-11-23 16:07:35 +0100 |
|---|---|---|
| committer | tkummermehr <thorsten.kummermehr@k2l.de> | 2017-11-23 16:07:35 +0100 |
| commit | a4e2909dadc88dccafb5b1d345ab0bbf408a9271 (patch) | |
| tree | 69e58e68a4bf742a21ab217b9e4647bd11add528 | |
| parent | dccdd78ea136c2481f0558cb3030a9add3a2004a (diff) | |
Use PKG_CONFIG instead of FIND_LIBeel_4.99.3eel/4.99.34.99.3
Change-Id: Ic6298bec9ed2fbb8bac6beb9648cfc77eb07e727
Signed-off-by: tkummermehr <thorsten.kummermehr@k2l.de>
| -rw-r--r-- | conf.d/project/config.cmake | 1 | ||||
| -rw-r--r-- | ucs2-interface/CMakeLists.txt | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/conf.d/project/config.cmake b/conf.d/project/config.cmake index c5f5357..abeae7c 100644 --- a/conf.d/project/config.cmake +++ b/conf.d/project/config.cmake @@ -74,6 +74,7 @@ set (PKG_REQUIRED_LIST libsystemd>=222 afb-daemon libmicrohttpd>=0.9.55 + libxml-2.0 ) # Prefix path where will be installed the files diff --git a/ucs2-interface/CMakeLists.txt b/ucs2-interface/CMakeLists.txt index f96d491..bcf3069 100644 --- a/ucs2-interface/CMakeLists.txt +++ b/ucs2-interface/CMakeLists.txt @@ -20,18 +20,15 @@ PROJECT_TARGET_ADD(ucs2-inter) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDEBUG") - # Search for libs - find_package (LibXml2 REQUIRED) - # Define targets ADD_LIBRARY(ucs2-inter STATIC ucs_lib_interf.c ucs-xml/UcsXml.c ucs-xml/UcsXml_Private.c) # Library properties SET_TARGET_PROPERTIES(ucs2-inter PROPERTIES OUTPUT_NAME ucs2interface) # Depends on Unicens2 lib - TARGET_LINK_LIBRARIES(ucs2-inter ucs2-lib ${LIBXML2_LIBRARIES}) + TARGET_LINK_LIBRARIES(ucs2-inter ucs2-lib) # Define includes TARGET_INCLUDE_DIRECTORIES(ucs2-inter - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${LIBXML2_INCLUDE_DIR} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) |