Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
belle-sip
Commits
e889521f
Commit
e889521f
authored
Feb 17, 2016
by
Ghislain MARY
Browse files
Fix finding of bctoolbox when building with CMake.
parent
20e2ac16
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
e889521f
...
...
@@ -102,7 +102,7 @@ endif()
if
(
LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS
)
include
(
"
${
EP_bctoolbox_CONFIG_DIR
}
/BcToolboxConfig.cmake"
)
else
()
find_package
(
BcTool
B
ox REQUIRED
)
find_package
(
BcTool
b
ox REQUIRED
)
endif
()
if
(
ENABLE_TUNNEL
)
...
...
cmake/BelleSIPConfig.cmake.in
View file @
e889521f
...
...
@@ -32,6 +32,11 @@ if(NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${CMAKE_CURRENT_LIST_DIR}/BelleSIPTargets.cmake")
endif()
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("EP_bctoolbox_CONFIG_DIR}/BcToolboxConfig.cmake")
else()
find_package(BcToolbox REQUIRED)
endif()
if(@ENABLE_TUNNEL@)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_tunnel_CONFIG_DIR}/TunnelConfig.cmake")
...
...
@@ -47,6 +52,8 @@ else()
set(BELLESIP_INCLUDE_DIRS "${BELLESIP_CMAKE_DIR}/../../../include")
endif()
set(BELLESIP_LIBRARIES bellesip)
list(APPEND BELLESIP_INCLUDE_DIRS ${BCTOOLBOX_INCLUDE_DIRS})
list(APPEND BELLESIP_LIBRARIES ${BCTOOLBOX_LIBRARIES})
set(BELLESIP_LDFLAGS "@LINK_FLAGS_STR@")
if(TUNNEL_FOUND)
list(APPEND BELLESIP_INCLUDE_DIRS ${TUNNEL_INCLUDE_DIRS})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment