From: Diane Trout <diane@caltech.edu>
Date: Sat, 27 May 2006 00:51:39 +0000 (+0000)
Subject: configure cmake to include support for QtAssistant
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=b45d01656e59b29d7ccfad3defff5a0938f15ce9

configure cmake to include support for QtAssistant
---

diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt
index 3599bdf..a717e5d 100644
--- a/py/CMakeLists.txt
+++ b/py/CMakeLists.txt
@@ -3,6 +3,8 @@ FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(PythonLibs)
 FIND_PACKAGE(PythonInterp)
 SET(QT_USE_QTOPENGL 1)
+SET(QT_USE_QTASSISTANT 1)
+SET(QT_USE_QTNETWORK 1)
 FIND_PACKAGE(Qt4)
 INCLUDE( ${QT_USE_FILE} )
 
@@ -34,9 +36,7 @@ INCLUDE( ${QT_USE_FILE} )
                           ${BOOST_FILESYSTEM_LIBRARY}
                           ${OPENGL_gl_LIBRARY}
                           ${PYTHON_LIBRARIES}
-                          ${QT_QTCORE_LIBRARY}
-                          ${QT_QTGUI_LIBRARY}
-                          ${QT_QTOPENGL_LIBRARY}
+                          ${QT_LIBRARIES} 
                         )
 
   IF(PYTHON_EXECUTABLE)
diff --git a/py/mussa.cpp b/py/mussa.cpp
index b82cb43..a16f9ad 100644
--- a/py/mussa.cpp
+++ b/py/mussa.cpp
@@ -6,9 +6,6 @@ using namespace boost::python;
 
 void export_mussa()
 {
-  //BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(mussa_analyze_overloads, 
-  //                                       &Mussa::analyze, 0, 4);
-
   void (Mussa::*load_mupa_string)(std::string) = &Mussa::load_mupa_file;
   class_<Mussa>("Mussa")
     .def("save", &Mussa::save)
diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt
index 631fa36..7a62c7a 100644
--- a/qui/CMakeLists.txt
+++ b/qui/CMakeLists.txt
@@ -4,6 +4,8 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE moc-qt4 )
 
 FIND_PACKAGE(Qt4)
 SET(QT_USE_QTOPENGL 1)
+SET(QT_USE_QTASSISTANT 1)
+SET(QT_USE_QTNETWORK 1)
 INCLUDE( ${QT_USE_FILE} )
 FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(Boost)
@@ -72,12 +74,7 @@ LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg
 TARGET_LINK_LIBRARIES(mussagl 
                         mussa_core
                         mussa_qui
-                        optimized ${QT_QTCORE_LIBRARY_RELEASE}
-                        optimized ${QT_QTGUI_LIBRARY_RELEASE}
-                        optimized ${QT_QTOPENGL_LIBRARY_RELEASE}
-                        debug ${QT_QTCORE_LIBRARY_DEBUG}
-                        debug ${QT_QTGUI_LIBRARY_DEBUG}
-                        debug ${QT_QTOPENGL_LIBRARY_DEBUG}
+                        ${QT_LIBRARIES}
                         ${OPENGL_gl_LIBRARY}
                         ${BOOST_PROGRAM_OPTIONS_LIBRARY}
                         ${BOOST_FILESYSTEM_LIBRARY}