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
liblinphone
Commits
b1efcd8c
Commit
b1efcd8c
authored
Sep 30, 2014
by
Ghislain MARY
Browse files
Fix build with tunnel support when compiling with CMake.
parent
2479a567
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
CMakeLists.txt
CMakeLists.txt
+10
-0
coreapi/CMakeLists.txt
coreapi/CMakeLists.txt
+5
-1
No files found.
CMakeLists.txt
View file @
b1efcd8c
...
...
@@ -61,6 +61,13 @@ endif()
find_package
(
BelleSIP REQUIRED
)
find_package
(
MS2 REQUIRED
)
find_package
(
XML2 REQUIRED
)
if
(
ENABLE_TUNNEL
)
find_package
(
Tunnel
)
if
(
NOT TUNNEL_FOUND
)
message
(
WARNING
"Could not find the tunnel library!"
)
set
(
ENABLE_TUNNEL OFF CACHE BOOL
"Enable tunnel support"
FORCE
)
endif
()
endif
()
include_directories
(
...
...
@@ -72,6 +79,9 @@ include_directories(
${
MS2_INCLUDE_DIRS
}
${
XML2_INCLUDE_DIRS
}
)
if
(
ENABLE_TUNNEL
)
include_directories
(
${
TUNNEL_INCLUDE_DIRS
}
)
endif
()
if
(
MSVC
)
include_directories
(
${
CMAKE_PREFIX_PATH
}
/include/MSVC
)
...
...
coreapi/CMakeLists.txt
View file @
b1efcd8c
...
...
@@ -53,7 +53,6 @@ set(SOURCE_FILES
info.c
linphonecall.c
linphonecore.c
linphone_tunnel_stubs.c
linphone_tunnel_config.c
lpconfig.c
lsd.c
...
...
@@ -89,6 +88,8 @@ if(ENABLE_TUNNEL)
TunnelManager.cc
)
add_definitions
(
-DTUNNEL_ENABLED
)
else
()
list
(
APPEND SOURCE_FILES linphone_tunnel_stubs.c
)
endif
()
set
(
GENERATED_SOURCE_FILES
...
...
@@ -116,6 +117,9 @@ set(LIBS
${
MS2_LIBRARIES
}
${
XML2_LIBRARIES
}
)
if
(
ENABLE_TUNNEL
)
list
(
APPEND LIBS
${
TUNNEL_LIBRARIES
}
)
endif
()
if
(
WIN32
)
list
(
APPEND LIBS shlwapi
)
endif
()
...
...
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