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
3695a153
Commit
3695a153
authored
Dec 22, 2015
by
Sylvain Berfini
🐮
Browse files
Fix cmake compilation of vcard.cc
parent
29715bd4
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
3695a153
...
...
@@ -234,8 +234,10 @@ endif()
set
(
STRICT_OPTIONS_CPP
)
set
(
STRICT_OPTIONS_C
)
set
(
STRICT_OPTIONS_CXX
)
set
(
STRICT_OPTIONS_OBJC
)
if
(
NOT MSVC
)
list
(
APPEND STRICT_OPTIONS_CXX
"-std=c++11"
)
list
(
APPEND STRICT_OPTIONS_CPP
"-Wall"
"-Wuninitialized"
"-Wno-error=deprecated-declarations"
)
list
(
APPEND STRICT_OPTIONS_C
"-Wdeclaration-after-statement"
"-Wstrict-prototypes"
"-Wno-error=strict-prototypes"
)
if
(
CMAKE_C_COMPILER_ID STREQUAL
"Clang"
)
...
...
coreapi/CMakeLists.txt
View file @
3695a153
...
...
@@ -137,9 +137,6 @@ add_definitions(
-DLIBLINPHONE_EXPORTS
)
apply_compile_flags
(
LINPHONE_SOURCE_FILES_C
"CPP"
"C"
)
apply_compile_flags
(
LINPHONE_SOURCE_FILES_CXX
"CPP"
"CXX"
)
set
(
LIBS
${
BELLESIP_LIBRARIES
}
${
MEDIASTREAMER2_LIBRARIES
}
...
...
@@ -174,6 +171,9 @@ else()
list
(
APPEND LINPHONE_SOURCE_FILES_C vcard_stubs.c
)
endif
()
apply_compile_flags
(
LINPHONE_SOURCE_FILES_C
"CPP"
"C"
)
apply_compile_flags
(
LINPHONE_SOURCE_FILES_CXX
"CPP"
"CXX"
)
if
(
ENABLE_STATIC
)
add_library
(
linphone STATIC
${
LINPHONE_HEADER_FILES
}
${
LINPHONE_SOURCE_FILES_C
}
${
LINPHONE_SOURCE_FILES_CXX
}
)
target_link_libraries
(
linphone
${
LIBS
}
)
...
...
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