Commit c47ad638 authored by François Grisez's avatar François Grisez
Browse files

Fixes missing linking flag for bctoolbox

The cmake script of belle-sip used bad variable names to get information
about the location of bctoolbox shared library.
parent c05ca9b4
...@@ -161,7 +161,7 @@ include_directories( ...@@ -161,7 +161,7 @@ include_directories(
src src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src
${BCTOOLBOX_CORE_INCLUDE_DIRS} ${BCTOOLBOX_INCLUDE_DIRS}
) )
if(TUNNEL_FOUND) if(TUNNEL_FOUND)
include_directories(${TUNNEL_INCLUDE_DIRS}) include_directories(${TUNNEL_INCLUDE_DIRS})
......
...@@ -56,8 +56,8 @@ if(@ENABLE_SHARED@) ...@@ -56,8 +56,8 @@ if(@ENABLE_SHARED@)
else() else()
set(BELLESIP_LIBRARIES bellesip-static) set(BELLESIP_LIBRARIES bellesip-static)
endif() endif()
list(APPEND BELLESIP_INCLUDE_DIRS ${BCTOOLBOX_CORE_INCLUDE_DIRS}) list(APPEND BELLESIP_INCLUDE_DIRS ${BCTOOLBOX_INCLUDE_DIRS})
list(APPEND BELLESIP_LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES}) list(APPEND BELLESIP_LIBRARIES ${BCTOOLBOX_LIBRARIES})
set(BELLESIP_LDFLAGS "@LINK_FLAGS_STR@") set(BELLESIP_LDFLAGS "@LINK_FLAGS_STR@")
if(TUNNEL_FOUND) if(TUNNEL_FOUND)
list(APPEND BELLESIP_INCLUDE_DIRS ${TUNNEL_INCLUDE_DIRS}) list(APPEND BELLESIP_INCLUDE_DIRS ${TUNNEL_INCLUDE_DIRS})
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
set(INCLUDES ${ANTLR3C_INCLUDE_DIRS}) set(INCLUDES ${ANTLR3C_INCLUDE_DIRS})
set(LIBS ${ANTLR3C_LIBRARIES}) set(LIBS ${ANTLR3C_LIBRARIES})
list(APPEND INCLUDES ${BCTOOLBOX_CORE_INCLUDE_DIR}) list(APPEND INCLUDES ${BCTOOLBOX_INCLUDE_DIR})
list(APPEND LIBS ${BCTOOLBOX_CORE_LIBRARIES}) list(APPEND LIBS ${BCTOOLBOX_LIBRARIES})
if(Threads_FOUND) if(Threads_FOUND)
if(CMAKE_USE_PTHREADS_INIT AND NOT CMAKE_SYSTEM_NAME MATCHES "QNX" AND NOT ANDROID) if(CMAKE_USE_PTHREADS_INIT AND NOT CMAKE_SYSTEM_NAME MATCHES "QNX" AND NOT ANDROID)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment