diff options
| author |   Yatian XU <yatian.xu@nokia-sbell.com> | 2019-09-26 10:28:28 +0800 |
|---|---|---|
| committer | Yatian XU <yatian.xu@nokia-sbell.com> | 2019-09-26 10:31:33 +0800 |
| commit | a4a27095e6c665baef5778f7399aabcb68ab6e7a (patch) | |
| tree | 77f10add911b90c14ac2bffaedff80f4b4fc4430 | |
| parent | 1571a7c1dbecc320d9e0c6014c845a1fe1abe377 (diff) | |
Contribute C++ implement of VES spec 7.0.1 to ONAP/vnfsdk:
Part6: change cmake files to run code coverage
Issue-ID: VNFSDK-466
Signed-off-by: Yatian XU <yatian.xu@nokia-sbell.com>
Change-Id: I60c06a1a0fd35416ab4fd021e97c4ac764adb693
3 files changed, 5 insertions, 5 deletions
diff --git a/veslibrary/ves_cpplibrary/src/cmake/xencodeConfig.cmake b/veslibrary/ves_cpplibrary/src/cmake/xencodeConfig.cmake index c0e2191..6f1b888 100644 --- a/veslibrary/ves_cpplibrary/src/cmake/xencodeConfig.cmake +++ b/veslibrary/ves_cpplibrary/src/cmake/xencodeConfig.cmake @@ -1,8 +1,8 @@ -find_library(XENCODE_LIBRARY xencode ${PROJECT_BINARY_DIR}/lib/encode) +find_library(XENCODE_LIBRARY xencode /usr/lib64 /usr/lib /usr/local/lib /usr/local/lib64 ${PROJECT_BINARY_DIR}/lib/encode) IF(${XENCODE_LIBRARY} MATCHES "XENCODE_LIBRARY-NOTFOUND") set(XENCODE_LIBRARY ${PROJECT_BINARY_DIR}/lib/encode/libxencode.so) ENDIF() -find_path(XENCODE_INCLUDE_DIR XEvent.h ${CMAKE_SOURCE_DIR}/lib/encode/include) +find_path(XENCODE_INCLUDE_DIR XEvent.h /usr/include/xvesagent/xencode /usr/local/include/xvesagent/xencode ${CMAKE_SOURCE_DIR}/lib/encode/include) message("xencode include dir: ${XENCODE_INCLUDE_DIR}") message("xencode library dir: ${XENCODE_LIBRARY}") diff --git a/veslibrary/ves_cpplibrary/src/cmake/xlogConfig.cmake b/veslibrary/ves_cpplibrary/src/cmake/xlogConfig.cmake index 2565d13..6d2992d 100644 --- a/veslibrary/ves_cpplibrary/src/cmake/xlogConfig.cmake +++ b/veslibrary/ves_cpplibrary/src/cmake/xlogConfig.cmake @@ -1,4 +1,4 @@ -find_path(XLOG_INCLUDE_DIR XLog.h ${CMAKE_SOURCE_DIR}/lib/common) +find_path(XLOG_INCLUDE_DIR XLog.h /usr/include/xvesagent/ /usr/local/include/xvesagent/ ${CMAKE_SOURCE_DIR}/lib/common) #set(XLOG_INCLUDE_DIR "${XLOG_INCLUDE_DIR}/xvesagent") message("xlog include dir: ${XLOG_INCLUDE_DIR}") diff --git a/veslibrary/ves_cpplibrary/src/cmake/xtransportConfig.cmake b/veslibrary/ves_cpplibrary/src/cmake/xtransportConfig.cmake index bc8060e..273afe1 100644 --- a/veslibrary/ves_cpplibrary/src/cmake/xtransportConfig.cmake +++ b/veslibrary/ves_cpplibrary/src/cmake/xtransportConfig.cmake @@ -1,8 +1,8 @@ -find_library(XTRANSPORT_LIBRARY xtransport ${PROJECT_BINARY_DIR}/lib/transport) +find_library(XTRANSPORT_LIBRARY xtransport /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 ${PROJECT_BINARY_DIR}/lib/transport) IF(XTRANSPORT_LIBRARY MATCHES "XTRANSPORT_LIBRARY-NOTFOUND") set(XTRANSPORT_LIBRARY ${PROJECT_BINARY_DIR}/lib/transport/libxtransport.so) ENDIF() -find_path(XTRANSPORT_INCLUDE_DIR XTransport.h ${CMAKE_SOURCE_DIR}/lib/transport/include) +find_path(XTRANSPORT_INCLUDE_DIR XTransport.h /usr/include/xvesagent/xtransport /usr/local/include/xvesagent/xtransport ${CMAKE_SOURCE_DIR}/lib/transport/include) message("xtransport include dir: ${XTRANSPORT_INCLUDE_DIR}") message("xtransport library dir: ${XTRANSPORT_LIBRARY}") |