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
b6065ba2
Commit
b6065ba2
authored
Jun 27, 2016
by
Ghislain MARY
Browse files
Use correct variables so that tools only depend on libbctoolbox and not libbctoolbox-tester.
parent
a315aa21
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b6065ba2
...
...
@@ -141,7 +141,7 @@ set(libdir ${prefix}/lib)
set
(
includedir
${
prefix
}
/include
)
get_filename_component
(
antlr3c_library_path
"
${
ANTLR3C_LIBRARIES
}
"
PATH
)
set
(
LIBS_PRIVATE
"-L
${
antlr3c_library_path
}
-lantlr3c"
)
get_filename_component
(
bctoolbox_library_path
"
${
BCTOOLBOX_LIBRARIES
}
"
PATH
)
get_filename_component
(
bctoolbox_library_path
"
${
BCTOOLBOX_
CORE_
LIBRARIES
}
"
PATH
)
set
(
LIBS_PRIVATE
"
${
LIBS_PRIVATE
}
-L
${
bctoolbox_library_path
}
-lbctoolbox"
)
if
(
ZLIB_FOUND
)
set
(
REQUIRES_PRIVATE
"
${
REQUIRES_PRIVATE
}
z"
)
...
...
tester/CMakeLists.txt
View file @
b6065ba2
...
...
@@ -97,7 +97,7 @@ else()
target_link_libraries
(
belle_sip_tester
"Ws2_32"
)
endif
()
target_include_directories
(
belle_sip_tester PUBLIC
${
BCTOOLBOX_TESTER_INCLUDE_DIRS
}
)
target_link_libraries
(
belle_sip_tester
${
BCTOOLBOX_LIBRARIES
}
${
BCTOOLBOX_TESTER_LIBRARIES
}
${
PROJECT_LIBS
}
)
target_link_libraries
(
belle_sip_tester
${
BCTOOLBOX_LIBRARIES
}
${
PROJECT_LIBS
}
)
add_test
(
NAME belle_sip_tester COMMAND belle_sip_tester --verbose
)
...
...
@@ -107,7 +107,7 @@ else()
if
(
NOT
"
${
LINK_FLAGS_STR
}
"
STREQUAL
""
)
set_target_properties
(
belle_sip_object_describe PROPERTIES LINK_FLAGS
"
${
LINK_FLAGS_STR
}
"
)
endif
()
target_link_libraries
(
belle_sip_object_describe
${
BCTOOLBOX_LIBRARIES
}
${
PROJECT_LIBS
}
)
target_link_libraries
(
belle_sip_object_describe
${
BCTOOLBOX_
CORE_
LIBRARIES
}
${
PROJECT_LIBS
}
)
set
(
PARSE_SOURCES parse.c
)
...
...
@@ -117,6 +117,6 @@ else()
if
(
NOT
"
${
LINK_FLAGS_STR
}
"
STREQUAL
""
)
set_target_properties
(
belle_sip_parse PROPERTIES LINK_FLAGS
"
${
LINK_FLAGS_STR
}
"
)
endif
()
target_link_libraries
(
belle_sip_parse
${
BCTOOLBOX_LIBRARIES
}
${
PROJECT_LIBS
}
)
target_link_libraries
(
belle_sip_parse
${
BCTOOLBOX_
CORE_
LIBRARIES
}
${
PROJECT_LIBS
}
)
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