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 1RDb8t-0001SU-6h for garchives@archives.gentoo.org; Tue, 11 Oct 2011 12:09:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C7CC21C101; Tue, 11 Oct 2011 12:08:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 306CA21C101 for ; Tue, 11 Oct 2011 12:08:59 +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 B0F571B4010 for ; Tue, 11 Oct 2011 12:08:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0C74F80042 for ; Tue, 11 Oct 2011 12:08:58 +0000 (UTC) From: "Theo Chatzimichos" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Chatzimichos" Message-ID: Subject: [gentoo-commits] proj/c-portage:cmake_port commit in: / X-VCS-Repository: proj/c-portage X-VCS-Committer: tampakrap X-VCS-Committer-Name: Theo Chatzimichos X-VCS-Revision: eae2c6c6591623e6ea286c6fbc5bacd10569b84e Date: Tue, 11 Oct 2011 12:08:58 +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: d959dd7dab74333b393601a7bd2dcba7 commit: eae2c6c6591623e6ea286c6fbc5bacd10569b84e Author: Theo Chatzimichos gentoo org> AuthorDate: Tue Oct 11 12:09:35 2011 +0000 Commit: Theo Chatzimichos gentoo org> CommitDate: Tue Oct 11 12:10:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/c-portage.git= ;a=3Dcommit;h=3Deae2c6c6 Merge branch 'terietor_interegation' into cmake_port src/CMakeLists.txt | 5 +- src/Qt/CMakeLists.txt | 12 +++- src/Qt/README | 3 + src/Qt/TODO | 2 + src/Qt/qlistconverter.cpp | 40 +++++++++++++ src/Qt/qlistconverter.h | 30 ++++++++++ src/Qt/qpackageproperties.cpp | 52 +++++++++++++++++ src/Qt/qpackageproperties.h | 32 +++++++++++ src/Qt/qportagesettings.cpp | 89 ++++++++++++++++++------= ------ src/Qt/qportagesettings.h | 43 +++++++-------- src/Qt/tests/CMakeLists.txt | 6 ++ src/Qt/tests/qlistconverter_test.cpp | 16 +++++ src/Qt/tests/qpackageproperties_test.cpp | 27 +++++++++ src/Qt/tests/qportagesettings_test.cpp | 34 +++++++++++ src/Qt/tests/test.cpp | 10 +++ 15 files changed, 336 insertions(+), 65 deletions(-) diff --cc src/Qt/CMakeLists.txt index 8388c30,b2849e8..d673e61 --- a/src/Qt/CMakeLists.txt +++ b/src/Qt/CMakeLists.txt @@@ -1,12 -1,16 +1,16 @@@ 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 qportage.cpp qportagesettings.cpp helper.cpp) - set(cpp-portage_HDRS qportage.h qportagesettings.h helper.h) -set(cpp-portage_SRCS qportagesettings.cpp qpackageproperties.cpp qlistc= onverter.cpp) -set(cpp-portage_HDRS qportagesettings.h qpackageproperties.h qlistconve= rter.h) ++set(cpp-portage_SRCS helper.cpp qportage.cpp qportagesettings.cpp qpack= ageproperties.cpp qlistconverter.cpp) ++set(cpp-portage_HDRS helper.h qportage.h qportagesettings.h qpackagepro= perties.h qlistconverter.h) =20 QT4_WRAP_CPP(cpp-portage_MOC_SRCS ${cpp-portage_HDRS}) =20 - add_library(cpp-portage SHARED ${cpp-portage_SRCS} ${cpp-portage_MOC_SR= CS}) + add_library(cpp-portage SHARED qportagesettings.cpp ${cpp-portage_MOC_S= RCS}) + target_link_libraries(cpp-portage c-portage ${QT_QTCORE_LIBRARY}) +=20 install(TARGETS cpp-portage DESTINATION lib) - install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage) + install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage) +=20 -add_subdirectory(tests) ++add_subdirectory(tests)