PR: test with Qt4.8 on Ubuntu 12.04 (native prerequisites)

diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4
index f7c60477ed01c116eef0d762586ccef1d5a76194..cb50cce222bbc6974bb06595460157e4de72cc57 100644 (file)
--- a/adm_local/unix/config_files/check_sip.m4
+++ b/adm_local/unix/config_files/check_sip.m4
@@ -72,6 +72,7 @@ if test "x$sip_ok" = "xyes" ; then
     fi
     TEST_INC_DIRS="${TEST_INC_DIRS} /usr/include /usr/include/python${PYTHON_VERSION}"
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages"
+    TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/dist-packages"
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/dist-packages/PyQt4"
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/pymodules/python${PYTHON_VERSION}"
     if test "${build_cpu::6}" = "x86_64" ; then

diff --git a/src/TreeData/Test/Makefile.am b/src/TreeData/Test/Makefile.am
index 8d6141e766e8a23ff1295e5b85af8c5f6b568bbb..a5fc7882f71e801675da11af8af3635e3af02dbd 100644 (file)
--- a/src/TreeData/Test/Makefile.am
+++ b/src/TreeData/Test/Makefile.am
@@ -48,7 +48,7 @@ TEST_CPPFLAGS = \
        -I.
 
 TEST_LDFLAGS  = \
-       $(CORBA_LIBS) $(QT_LIBS) \
+       $(CORBA_LIBS) $(QT_LIBS) $(VTK_LIBS) \
        $(top_builddir)/src/TreeData/libSalomeTreeData.la \
        $(top_builddir)/src/GuiHelpers/libSalomeGuiHelpers.la \
        $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeKernelHelpers