Return-Path: X-Original-To: apmail-corinthia-dev-archive@minotaur.apache.org Delivered-To: apmail-corinthia-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BA3B18E0C for ; Tue, 9 Jun 2015 07:44:09 +0000 (UTC) Received: (qmail 68694 invoked by uid 500); 9 Jun 2015 07:44:09 -0000 Delivered-To: apmail-corinthia-dev-archive@corinthia.apache.org Received: (qmail 68662 invoked by uid 500); 9 Jun 2015 07:44:09 -0000 Mailing-List: contact dev-help@corinthia.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@corinthia.incubator.apache.org Delivered-To: mailing list dev@corinthia.incubator.apache.org Received: (qmail 68650 invoked by uid 99); 9 Jun 2015 07:44:09 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2015 07:44:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 925C0CCB07 for ; Tue, 9 Jun 2015 07:44:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.98 X-Spam-Level: ** X-Spam-Status: No, score=2.98 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.001, HTML_MESSAGE=3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 4R-1kKKb_gJL for ; Tue, 9 Jun 2015 07:44:07 +0000 (UTC) Received: from mail-vn0-f65.google.com (mail-vn0-f65.google.com [209.85.216.65]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTPS id 3016021544 for ; Tue, 9 Jun 2015 07:44:07 +0000 (UTC) Received: by vnbf7 with SMTP id f7so1121794vnb.1 for ; Tue, 09 Jun 2015 00:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:content-type; bh=JaXiWCB73j/sPmItiVGf0Iwy69CXDOLWpJ66cdBgRcc=; b=RTENmW+28ZwtXg5UdcUSfes0RWJR8Bxw6DUz6a/ZebtYtlXhWTNV0uz6KKTH8Qpi+M sT7X8UJmL9Y6rdOKNMtDFNrUExHdM/bu2IIi/3bqJvJvSPzaicU1aZnQ0ct/D5dxc8K9 68UPMvHQ/NhYSaj/2nngCRrrTVMc7qrKL9TS+cRvquTrhzBniBxE7/n62aV/v8vYnJ1q b7760GL7AcD5XSUsc6qDzTNztNb4SO7voel7xkU3OKCW/J4hUiUiNoRYumzcVmQ1coMj mvCD5RcqDLoQONJv2v1hE9ax+6mgG0kcoXBKEVCfuoS+PW31uWVRxU46/93qRBZTkfyt iSqw== MIME-Version: 1.0 X-Received: by 10.52.233.166 with SMTP id tx6mr39171457vdc.91.1433835846116; Tue, 09 Jun 2015 00:44:06 -0700 (PDT) Sender: hammyau@gmail.com Received: by 10.52.150.41 with HTTP; Tue, 9 Jun 2015 00:44:06 -0700 (PDT) Date: Tue, 9 Jun 2015 15:44:06 +0800 X-Google-Sender-Auth: 51pRymMrD3UMu_ZCqjEIfPhznnA Message-ID: Subject: Git newbie and build question From: Ian C To: dev Content-Type: multipart/alternative; boundary=089e011601d2462d5f051810ec36 --089e011601d2462d5f051810ec36 Content-Type: text/plain; charset=UTF-8 Hi, I am a relative git newbie, and have I think goofed up my code tree. I merged Gabriela's branch rather than fetching it. So my world is kind of confused, Apart from saving my files, restarting and then importing my files is there anything else I can do? And FYI my build didn't work due to a line CMakeList.txt I looked through its history and removed add_subdirectory(consumers/corinthia/src) And all was well. Don't understand the details. With the above line it was complaining about qt5 related paths. May be a consequence of my goofed git state? -- Cheers, Ian C --089e011601d2462d5f051810ec36--