Return-Path: X-Original-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CCEC911F95 for ; Sun, 6 Jul 2014 11:18:08 +0000 (UTC) Received: (qmail 75758 invoked by uid 500); 6 Jul 2014 11:18:08 -0000 Delivered-To: apmail-incubator-celix-commits-archive@incubator.apache.org Received: (qmail 75733 invoked by uid 500); 6 Jul 2014 11:18:08 -0000 Mailing-List: contact celix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: celix-dev@incubator.apache.org Delivered-To: mailing list celix-commits@incubator.apache.org Received: (qmail 75721 invoked by uid 99); 6 Jul 2014 11:18:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jul 2014 11:18:08 +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; Sun, 06 Jul 2014 11:18:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 62E1C2388906; Sun, 6 Jul 2014 11:17:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1608183 - in /incubator/celix/trunk: cmake/CMakeCelix.cmake framework/CMakeLists.txt utils/CMakeLists.txt Date: Sun, 06 Jul 2014 11:17:47 -0000 To: celix-commits@incubator.apache.org From: bpetri@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140706111747.62E1C2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bpetri Date: Sun Jul 6 11:17:46 2014 New Revision: 1608183 URL: http://svn.apache.org/r1608183 Log: CELIX-125 moved CodeCoverage include to CMakeCelix Modified: incubator/celix/trunk/cmake/CMakeCelix.cmake incubator/celix/trunk/framework/CMakeLists.txt incubator/celix/trunk/utils/CMakeLists.txt Modified: incubator/celix/trunk/cmake/CMakeCelix.cmake URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CMakeCelix.cmake?rev=1608183&r1=1608182&r2=1608183&view=diff ============================================================================== --- incubator/celix/trunk/cmake/CMakeCelix.cmake (original) +++ incubator/celix/trunk/cmake/CMakeCelix.cmake Sun Jul 6 11:17:46 2014 @@ -28,3 +28,4 @@ include(cmake_celix/Dependencies) include(cmake_celix/Packaging) include(cmake_celix/Test) include(cmake_celix/ApacheRat) +include(cmake_celix/CodeCoverage) Modified: incubator/celix/trunk/framework/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1608183&r1=1608182&r2=1608183&view=diff ============================================================================== --- incubator/celix/trunk/framework/CMakeLists.txt (original) +++ incubator/celix/trunk/framework/CMakeLists.txt Sun Jul 6 11:17:46 2014 @@ -79,7 +79,6 @@ if (FRAMEWORK) celix_subproject(FRAMEWORK_TESTS "Option to build the framework tests" "OFF" DEPS) if (FRAMEWORK_TESTS) - include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake) find_package(CppUTest REQUIRED) include_directories(${CPPUTEST_INCLUDE_DIR}) Modified: incubator/celix/trunk/utils/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/CMakeLists.txt?rev=1608183&r1=1608182&r2=1608183&view=diff ============================================================================== --- incubator/celix/trunk/utils/CMakeLists.txt (original) +++ incubator/celix/trunk/utils/CMakeLists.txt Sun Jul 6 11:17:46 2014 @@ -56,7 +56,6 @@ if (UTILS) celix_subproject(UTILS-TESTS "Option to build the utilities library tests" "OFF") if (UTILS-TESTS) - include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake) find_package(CppUTest REQUIRED) include_directories(${CUNIT_INCLUDE_DIRS})