From 63ec344f3b948e39cd04a2702c50268ca68bda85 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 18 Jan 2016 10:42:57 +0100 Subject: [PATCH] Updated CMakeLists to easy merge with master --- CMakeLists.txt | 3 +-- coreapi/CMakeLists.txt | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5316eb316..41c0bb8c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,10 +238,9 @@ endif() set(STRICT_OPTIONS_CPP ) set(STRICT_OPTIONS_C ) -set(STRICT_OPTIONS_CXX ) +set(STRICT_OPTIONS_CXX "-std=c++11") 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 d38c25dfa..08f9ce90d 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -146,10 +146,6 @@ add_definitions( -DLIBLINPHONE_EXPORTS ) -apply_compile_flags(LINPHONE_SOURCE_FILES_C "CPP" "C") -apply_compile_flags(LINPHONE_SOURCE_FILES_CXX "CPP" "CXX") -apply_compile_flags(LINPHONE_SOURCE_FILES_OBJC "CPP" "OBJC") - set(LIBS ${BELLESIP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} @@ -186,6 +182,7 @@ endif() apply_compile_flags(LINPHONE_SOURCE_FILES_C "CPP" "C") apply_compile_flags(LINPHONE_SOURCE_FILES_CXX "CPP" "CXX") +apply_compile_flags(LINPHONE_SOURCE_FILES_OBJC "CPP" "OBJC") if(ENABLE_STATIC) add_library(linphone STATIC ${LINPHONE_HEADER_FILES} ${LINPHONE_SOURCE_FILES_C} ${LINPHONE_SOURCE_FILES_CXX} ${LINPHONE_SOURCE_FILES_OBJC})