diff options
Diffstat (limited to 'veslibrary/ves_cpplibrary/src/cmake')
3 files changed, 12 insertions, 8 deletions
diff --git a/veslibrary/ves_cpplibrary/src/cmake/xencodeConfig.cmake b/veslibrary/ves_cpplibrary/src/cmake/xencodeConfig.cmake index 2c8c993..c0e2191 100644 --- a/veslibrary/ves_cpplibrary/src/cmake/xencodeConfig.cmake +++ b/veslibrary/ves_cpplibrary/src/cmake/xencodeConfig.cmake @@ -1,6 +1,8 @@ -find_library(XENCODE_LIBRARY xencode) -find_path(XENCODE_INCLUDE_DIR xvesagent/xencode/XEvent.h) -set(XENCODE_INCLUDE_DIR "${XENCODE_INCLUDE_DIR}/xvesagent/xencode") +find_library(XENCODE_LIBRARY xencode ${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) 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 819279f..2565d13 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 xvesagent/XLog.h) -set(XLOG_INCLUDE_DIR "${XLOG_INCLUDE_DIR}/xvesagent") +find_path(XLOG_INCLUDE_DIR XLog.h ${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 f0163eb..bc8060e 100644 --- a/veslibrary/ves_cpplibrary/src/cmake/xtransportConfig.cmake +++ b/veslibrary/ves_cpplibrary/src/cmake/xtransportConfig.cmake @@ -1,6 +1,8 @@ -find_library(XTRANSPORT_LIBRARY xtransport) -find_path(XTRANSPORT_INCLUDE_DIR xvesagent/xtransport/XTransport.h) -set(XTRANSPORT_INCLUDE_DIR "${XTRANSPORT_INCLUDE_DIR}/xvesagent/xtransport") +find_library(XTRANSPORT_LIBRARY xtransport ${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) message("xtransport include dir: ${XTRANSPORT_INCLUDE_DIR}") message("xtransport library dir: ${XTRANSPORT_LIBRARY}") |