From acf340b7e2f3c7a525fc68154dd86d28efa9194d Mon Sep 17 00:00:00 2001 From: prascle Date: Thu, 13 Dec 2012 12:42:19 +0000 Subject: [PATCH] PR: test with Qt4.8 on Ubuntu 12.04 (native prerequisites) --- adm_local/unix/config_files/check_sip.m4 | 1 + src/TreeData/Test/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4 index f7c60477e..cb50cce22 100644 --- 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 8d6141e76..a5fc7882f 100644 --- 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 -- 2.39.2