From 3695a15374f422ebe531773a5a9ed64b941bda5e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 22 Dec 2015 17:24:39 +0100 Subject: [PATCH] Fix cmake compilation of vcard.cc --- CMakeLists.txt | 2 ++ coreapi/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb30a1e26..de89c2d4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index 989051e89..6ac661726 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -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})