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 0B8FD1191F for ; Tue, 3 Jun 2014 08:36:32 +0000 (UTC) Received: (qmail 30845 invoked by uid 500); 3 Jun 2014 08:36:32 -0000 Delivered-To: apmail-incubator-celix-commits-archive@incubator.apache.org Received: (qmail 30828 invoked by uid 500); 3 Jun 2014 08:36:32 -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 30821 invoked by uid 99); 3 Jun 2014 08:36:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2014 08:36:31 +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; Tue, 03 Jun 2014 08:36:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 51AC62388868; Tue, 3 Jun 2014 08:36:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1599448 - in /incubator/celix/trunk/event_admin: event_admin/CMakeLists.txt event_handler/CMakeLists.txt event_publisher/CMakeLists.txt utils/CMakeLists.txt Date: Tue, 03 Jun 2014 08:36:10 -0000 To: celix-commits@incubator.apache.org From: pnoltes@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140603083610.51AC62388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pnoltes Date: Tue Jun 3 08:36:09 2014 New Revision: 1599448 URL: http://svn.apache.org/r1599448 Log: CELIX-116: updated CMakeLists files for inline Celix project. e.g. removed include with CELIX_INCLUDE_DIR and required(celix) statements. Modified: incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt incubator/celix/trunk/event_admin/utils/CMakeLists.txt Modified: incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt?rev=1599448&r1=1599447&r2=1599448&view=diff ============================================================================== --- incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt (original) +++ incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt Tue Jun 3 08:36:09 2014 @@ -16,11 +16,10 @@ # under the License. find_package(APR REQUIRED) -find_package(CELIX REQUIRED) +include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories(public/include) include_directories(private/include) -include_directories("${CELIX_INCLUDE_DIRS}") #include_directories(../utils/public/include) SET_HEADER(BUNDLE_SYMBOLICNAME "eventadmin") Modified: incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt?rev=1599448&r1=1599447&r2=1599448&view=diff ============================================================================== --- incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt (original) +++ incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt Tue Jun 3 08:36:09 2014 @@ -16,11 +16,10 @@ # under the License. find_package(APR REQUIRED) -find_package(CELIX REQUIRED) +include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories(private/include) include_directories(${PROJECT_SOURCE_DIR}/event_admin/event_admin/public/include) -include_directories("${CELIX_INCLUDE_DIRS}") SET_HEADER(BUNDLE_SYMBOLICNAME "eventhandler") SET_HEADERS("Bundle-Name: Event Handler") Modified: incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt?rev=1599448&r1=1599447&r2=1599448&view=diff ============================================================================== --- incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt (original) +++ incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt Tue Jun 3 08:36:09 2014 @@ -16,11 +16,10 @@ # under the License. find_package(APR REQUIRED) -find_package(CELIX REQUIRED) +include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories(private/include) include_directories(${PROJECT_SOURCE_DIR}/event_admin/event_admin/public/include) -include_directories("${CELIX_INCLUDE_DIRS}") SET_HEADER(BUNDLE_SYMBOLICNAME "event_publisher") SET_HEADERS("Bundle-Name: Event Publisher") Modified: incubator/celix/trunk/event_admin/utils/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/event_admin/utils/CMakeLists.txt?rev=1599448&r1=1599447&r2=1599448&view=diff ============================================================================== --- incubator/celix/trunk/event_admin/utils/CMakeLists.txt (original) +++ incubator/celix/trunk/event_admin/utils/CMakeLists.txt Tue Jun 3 08:36:09 2014 @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. find_package(APR REQUIRED) -find_package(CELIX REQUIRED) -include_directories("${CELIX_INCLUDE_DIRS}") + +include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories("${PROJECT_SOURCE_DIR}/event_admin/event_admin/public/include") include_directories(public/include) @@ -24,4 +24,4 @@ add_library(event_admin_utils STATIC pri target_link_libraries(event_admin_utils ${APRUTIL_LIBRARY}) #install(TARGETS event_admin_utils DESTINATION lib COMPONENT framework) #FILE(GLOB files "public/include/*.h") -#INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework) \ No newline at end of file +#INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)