try to update for boost 1.34

I really need a better way of searching for all the different types of boost
names.

diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake
index 4efe30f486f56386033f654405626d1a23ec066a..e65bb30443c94d5860ab890c9480208b9130689e 100644 (file)
--- a/makelib/FindBoost.cmake
+++ b/makelib/FindBoost.cmake
@@ -5,8 +5,13 @@
 
 FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp 
                             /usr/include 
+                            /usr/include/boost-1_34
+                            /usr/include/boost-1_33
                             /usr/local/include
+                            /usr/local/include/boost-1_34
+                            /usr/local/include/boost-1_33
                             C:\\Boost\\Include
+                            C:\\Boost\\Include\\boost-1_34
                             C:\\Boost\\include\\boost-1_33_1 )
 
 
@@ -45,19 +50,41 @@ IF(MINGW)
 ELSE(MINGW)
 
 
-FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY NAMES boost_filesystem
+FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY NAMES 
+              boost_filesystem
+              boost_filesystem-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY NAMES boost_program_options
+FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY NAMES 
+              boost_program_options
+              boost_program_options-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES boost_python
+FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES 
+              boost_python
+              boost_python-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES boost_python-d
+FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES 
+              boost_python-d
+              boost_python-40-d
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY NAMES boost_serialization
+FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY NAMES 
+              boost_serialization
+              boost_serialization-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG NAMES boost_serialization-d
+FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG NAMES 
+              boost_serialization-d
+              boost_serialization-40-d
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES boost_unit_test_framework 
+FIND_LIBRARY( BOOST_SIGNALS_LIBRARY NAMES 
+              boost_signals
+              boost_signals-40
+              PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
+FIND_LIBRARY( BOOST_SIGNALS_LIBRARY_DEBUG NAMES 
+              boost_signals-d
+              boost_signals-40-d
+              PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
+FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES 
+              boost_unit_test_framework 
+              boost_unit_test_framework-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
 
 ENDIF(MINGW)

diff --git a/sip/mussamod.sip b/sip/mussamod.sip
index 172e768d39bade91f6b8455d1b1edf0d22fc48d0..7a59710fc61381df96481d85cc3217905fe237fb 100644 (file)
--- a/sip/mussamod.sip
+++ b/sip/mussamod.sip
@@ -4,6 +4,4 @@
 %Import QtGui/QtGuimod.sip
 %Import QtCore/QtCoremod.sip
 
-%Include ../qui/mussa_setup_dialog/MussaSetupDialog.sip
-
-
+%Include qui/mussa_setup_dialog/MussaSetupDialog.sip