[gentoo-commits] proj/c-portage:master commit in: /

[gentoo-commits] proj/c-portage:master commit in: /

[Theofilos Intzoglou]

commit:     eae2c6c6591623e6ea286c6fbc5bacd10569b84e
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 12:09:35 2011 +0000
Commit:     Theofilos Intzoglou <int.teo <AT> gmail <DOT> com>
CommitDate: Tue Oct 11 12:10:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/c-portage.git;a=commit;h=eae2c6c6

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=c99)
  
- 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 qlistconverter.cpp)
 -set(cpp-portage_HDRS qportagesettings.h qpackageproperties.h qlistconverter.h)
++set(cpp-portage_SRCS helper.cpp qportage.cpp qportagesettings.cpp qpackageproperties.cpp qlistconverter.cpp)
++set(cpp-portage_HDRS helper.h qportage.h qportagesettings.h qpackageproperties.h qlistconverter.h)
  
  QT4_WRAP_CPP(cpp-portage_MOC_SRCS ${cpp-portage_HDRS})
  
- add_library(cpp-portage SHARED ${cpp-portage_SRCS} ${cpp-portage_MOC_SRCS})
+ add_library(cpp-portage SHARED qportagesettings.cpp ${cpp-portage_MOC_SRCS})
+ target_link_libraries(cpp-portage c-portage ${QT_QTCORE_LIBRARY})
+ 
  install(TARGETS cpp-portage DESTINATION lib)
- install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage)
+ install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage)
+ 
 -add_subdirectory(tests)
++add_subdirectory(tests)