Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 34ED310816 for ; Mon, 27 Jan 2014 22:11:15 +0000 (UTC) Received: (qmail 54518 invoked by uid 500); 27 Jan 2014 22:11:14 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 54467 invoked by uid 500); 27 Jan 2014 22:11:14 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 54459 invoked by uid 99); 27 Jan 2014 22:11:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jan 2014 22:11:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jan 2014 22:11:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4B58C23888D7; Mon, 27 Jan 2014 22:10:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1561877 - /qpid/dispatch/trunk/CMakeLists.txt Date: Mon, 27 Jan 2014 22:10:51 -0000 To: commits@qpid.apache.org From: mcpierce@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140127221051.4B58C23888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcpierce Date: Mon Jan 27 22:10:50 2014 New Revision: 1561877 URL: http://svn.apache.org/r1561877 Log: QPID-5517: Do not discard user defined CFLAGS. Refactored how additional compiler flags are appended. Modified: qpid/dispatch/trunk/CMakeLists.txt Modified: qpid/dispatch/trunk/CMakeLists.txt URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/CMakeLists.txt?rev=1561877&r1=1561876&r2=1561877&view=diff ============================================================================== --- qpid/dispatch/trunk/CMakeLists.txt (original) +++ qpid/dispatch/trunk/CMakeLists.txt Mon Jan 27 22:10:50 2014 @@ -82,7 +82,10 @@ include_directories( ${PYTHON_INCLUDE_PATH} ) -set(CMAKE_C_FLAGS "-pthread -Wall -Werror -std=gnu99") +add_compile_options(-pthread) +add_compile_options(-Wall) +add_compile_options(-Werror) +add_compile_options(-std=gnu99) set(CATCH_UNDEFINED "-Wl,--no-undefined") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/conditionals.h.in --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org