mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-02-07 14:18:25 +00:00
Fix cmake compilation of vcard.cc
This commit is contained in:
parent
29715bd4ee
commit
3695a15374
2 changed files with 5 additions and 3 deletions
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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})
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue