From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RCgYA-0006Ub-S9 for garchives@archives.gentoo.org; Sat, 08 Oct 2011 23:43:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A85D921C11E; Sat, 8 Oct 2011 23:43:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7C40C21C11E for ; Sat, 8 Oct 2011 23:43:19 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7B011B4001 for ; Sat, 8 Oct 2011 23:43:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A96BD80042 for ; Sat, 8 Oct 2011 23:43:17 +0000 (UTC) From: "Theofilos Intzoglou" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theofilos Intzoglou" Message-ID: <4bcf480e940a0c74a1fb351582e81eb68359280a.parapente@gentoo> Subject: [gentoo-commits] proj/c-portage:cmake_port commit in: /, src/Qt/ X-VCS-Repository: proj/c-portage X-VCS-Files: CMakeLists.txt src/Qt/CMakeLists.txt X-VCS-Directories: / src/Qt/ X-VCS-Committer: parapente X-VCS-Committer-Name: Theofilos Intzoglou X-VCS-Revision: 4bcf480e940a0c74a1fb351582e81eb68359280a Date: Sat, 8 Oct 2011 23:43:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 17ee810ad4b330f9fa86ec7b1315b88e commit: 4bcf480e940a0c74a1fb351582e81eb68359280a Author: Theofilos Intzoglou gmail com> AuthorDate: Sat Oct 8 23:37:34 2011 +0000 Commit: Theofilos Intzoglou gmail com> CommitDate: Sat Oct 8 23:37:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/c-portage.git= ;a=3Dcommit;h=3D4bcf480e Make cpp-portage a shared library, correctly identify which header files to install and fix include paths --- CMakeLists.txt | 3 --- src/Qt/CMakeLists.txt | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 149d05d..e9823d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,4 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_MODULE_PATH ${c-portage_SOURCE_DIR}/cmake) find_package(PortageApi REQUIRED) =20 -install(DIRECTORY src/ DESTINATION include/c-portage - FILES_MATCHING PATTERN "*.h") - add_subdirectory(src) diff --git a/src/Qt/CMakeLists.txt b/src/Qt/CMakeLists.txt index 2a19c3e..8388c30 100644 --- a/src/Qt/CMakeLists.txt +++ b/src/Qt/CMakeLists.txt @@ -1,12 +1,12 @@ find_package(Qt4 REQUIRED) -include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) +include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ..) remove_definitions(-std=3Dc99) =20 -set(cpp-portage_SRCS qportagesettings.cpp) -set(cpp-portage_HDRS qportagesettings.h) +set(cpp-portage_SRCS qportage.cpp qportagesettings.cpp helper.cpp) +set(cpp-portage_HDRS qportage.h qportagesettings.h helper.h) =20 QT4_WRAP_CPP(cpp-portage_MOC_SRCS ${cpp-portage_HDRS}) =20 -add_library(cpp-portage qportagesettings.cpp ${cpp-portage_MOC_SRCS}) +add_library(cpp-portage SHARED ${cpp-portage_SRCS} ${cpp-portage_MOC_SRC= S}) install(TARGETS cpp-portage DESTINATION lib) install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage) \ No newline at end of file