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 B241AF695 for ; Wed, 29 May 2013 20:55:17 +0000 (UTC) Received: (qmail 11890 invoked by uid 500); 29 May 2013 20:55:17 -0000 Delivered-To: apmail-incubator-celix-commits-archive@incubator.apache.org Received: (qmail 11869 invoked by uid 500); 29 May 2013 20:55:17 -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 11862 invoked by uid 99); 29 May 2013 20:55:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 May 2013 20:55:17 +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; Wed, 29 May 2013 20:55:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 142832388A29; Wed, 29 May 2013 20:54:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1487644 - in /incubator/celix/trunk: CMakeLists.txt cmake/installation.cmake Date: Wed, 29 May 2013 20:54:54 -0000 To: celix-commits@incubator.apache.org From: pnoltes@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130529205455.142832388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pnoltes Date: Wed May 29 20:54:54 2013 New Revision: 1487644 URL: http://svn.apache.org/r1487644 Log: CELIX-57: Updated installation.cmake with correct version for the framework and the root CMakeLists with the correct default version for bundles. Modified: incubator/celix/trunk/CMakeLists.txt incubator/celix/trunk/cmake/installation.cmake Modified: incubator/celix/trunk/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1487644&r1=1487643&r2=1487644&view=diff ============================================================================== --- incubator/celix/trunk/CMakeLists.txt (original) +++ incubator/celix/trunk/CMakeLists.txt Wed May 29 20:54:54 2013 @@ -38,7 +38,7 @@ include(cmake/installation.cmake) include(UseDoxygen) -set(DEFAULT_VERSION 0.0.1-incubation) +set(DEFAULT_VERSION 0.0.1.incubation) ## New sub project must use a buildoption to be able to enable/disable the project using the CMake Editor ## Sub projects depending on another sub project automatically enable these dependencies Modified: incubator/celix/trunk/cmake/installation.cmake URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/installation.cmake?rev=1487644&r1=1487643&r2=1487644&view=diff ============================================================================== --- incubator/celix/trunk/cmake/installation.cmake (original) +++ incubator/celix/trunk/cmake/installation.cmake Wed May 29 20:54:54 2013 @@ -18,7 +18,7 @@ # Set version SET(FRAMEWORK_MAJOR "0") SET(FRAMEWORK_MINOR "0") -SET(FRAMEWORK_PATCH "1-incubation") +SET(FRAMEWORK_PATCH "1.incubation") SET(CMAKE_INSTALL_COMPONENT "Framework") GET_FILENAME_COMPONENT(__cmake_path ${CMAKE_COMMAND} PATH)