Correction for .qm files creation

diff --git a/src/Plot2d/Plot2d.pro b/src/Plot2d/Plot2d.pro
index 12abe7b160abea8ca4c7c2df9894fbf14c8ea48e..dbaa3f700fcbea7393e34c9adb34e16d970b77be 100644 (file)
--- a/src/Plot2d/Plot2d.pro
+++ b/src/Plot2d/Plot2d.pro
@@ -4,15 +4,11 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-PYTHONVER=2.4
-PYTHONHOME=$$(PYTHONHOME)
-PYTHONINC=$${PYTHONHOME}/include/python$${PYTHONVER}
-
 QWTHOME=$$(QWTHOME)
-QWTINC=$${QWTHOME}/include
+QWTINC=$${QWTHOME}/includes
 QWTLIB=$${QWTHOME}/lib
 
-INCLUDEPATH += ../../include $${QWTINC} $${PYTHONINC}
+INCLUDEPATH += ../../include $${QWTINC} $$(PYTHONINC)
 INCLUDEPATH += ../Qtx ../SUIT
 unix:LIBS  += -L$${QWTLIB} -lqwt
 win32:LIBS += /LIBPATH:$$(QWTLIB)
@@ -31,12 +27,26 @@ SOURCES  = *.cxx
 TRANSLATIONS = resources/Plot2d_msg_en.ts \
                resources/Plot2d_images.ts
 
+unix:GUIResources = ../../resources
+win32:GUIResources = ..\\..\\resources
+
+lrelease.name = LRELASE ${QMAKE_FILE_IN}
+unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.input = TRANSLATIONS
+unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.CONFIG += no_link target_predeps
+QMAKE_EXTRA_COMPILERS += lrelease
+
 ICONS = resources/*.png
 
 includes.files = $$HEADERS
 includes.path = ../../include
 
-resources.files = $$ICONS resources/*.qm
+resources.files = $$ICONS
 resources.path = ../../resources
 
 INSTALLS += includes resources

diff --git a/src/PyConsole/PyConsole.pro b/src/PyConsole/PyConsole.pro
index 77a8a30e74cfc8b8a521842b7180749541d8f535..01a4f69c6e728208ec52b6ae21f47610248b6781 100644 (file)
--- a/src/PyConsole/PyConsole.pro
+++ b/src/PyConsole/PyConsole.pro
@@ -5,7 +5,7 @@ MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH += ../../include $$(PYTHONINC)
-unix:LIBS  += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lpython2.4 -lSUIT -lPyInterp
+unix:LIBS  += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lpython2.5 -lSUIT -lPyInterp
 win32:LIBS += /LIBPATH:$$(PYTHONLIB) ../../lib/pyinterp.lib ../../lib/suit.lib
 
 CONFIG -= debug release debug_and_release
@@ -20,10 +20,21 @@ SOURCES = *.cxx
 
 TRANSLATIONS = resources/PyConsole_msg_en.ts
 
+unix:GUIResources = ../../resources
+win32:GUIResources = ..\\..\\resources
+
+lrelease.name = LRELASE ${QMAKE_FILE_IN}
+unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.input = TRANSLATIONS
+unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.CONFIG += no_link target_predeps
+QMAKE_EXTRA_COMPILERS += lrelease
+
 includes.files = $$HEADERS
 includes.path = ../../include
 
-resources.files = resources/*.qm
-resources.path = ../../resources
-
-INSTALLS += includes resources
+INSTALLS += includes

diff --git a/src/SUIT/SUIT.pro b/src/SUIT/SUIT.pro
index 7bad1747f2bf13eb76ca2572054715eaeded9e04..44ed4e814c6d4912741031139e2c9bbe2421a13f 100644 (file)
--- a/src/SUIT/SUIT.pro
+++ b/src/SUIT/SUIT.pro
@@ -20,12 +20,26 @@ SOURCES = *.cxx
 TRANSLATIONS = resources/SUIT_images.ts \
                resources/SUIT_msg_en.ts
 
+unix:GUIResources = ../../resources
+win32:GUIResources = ..\\..\\resources
+
+lrelease.name = LRELASE ${QMAKE_FILE_IN}
+unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.input = TRANSLATIONS
+unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.CONFIG += no_link target_predeps
+QMAKE_EXTRA_COMPILERS += lrelease
+
 ICONS   = resources/*.png
 
 includes.files = $$HEADERS
 includes.path = ../../include
 
-resources.files = $$ICONS resources/*.qm
+resources.files = $$ICONS
 resources.path = ../../resources
 
 INSTALLS += includes resources

diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro
index aecb9d512e0d9e084bd08962fce91ae068320dff..357b02200be50212d36be25e9bd53660fd3f23d4 100644 (file)
--- a/src/VTKViewer/VTKViewer.pro
+++ b/src/VTKViewer/VTKViewer.pro
@@ -4,17 +4,14 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-VTKHOME = $$(VTKHOME)
-VTK_INCLUDES = $${VTKHOME}/include/vtk
-
-VTK_LIBS = -L$${VTKHOME}/lib/vtk -L$${VTKHOME}/lib/vtk/python -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
+VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
 
 CASROOT = $$(CASROOT)
 CAS_CPPFLAGS = $${CASROOT}/inc
 
 CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
 
-INCLUDEPATH += ../../include $${VTK_INCLUDES} $${CAS_CPPFLAGS} ../Qtx ../SUIT
+INCLUDEPATH += ../../include $$(VTKINC) $${CAS_CPPFLAGS} ../Qtx ../SUIT
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${VTK_LIBS} $${CAS_KERNEL}
 
 CONFIG -= debug release debug_and_release
@@ -30,12 +27,26 @@ SOURCES  = *.cxx
 TRANSLATIONS = resources/VTKViewer_images.ts \
                resources/VTKViewer_msg_en.ts
 
+unix:GUIResources = ../../resources
+win32:GUIResources = ..\\..\\resources
+
+lrelease.name = LRELASE ${QMAKE_FILE_IN}
+unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.input = TRANSLATIONS
+unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.CONFIG += no_link target_predeps
+QMAKE_EXTRA_COMPILERS += lrelease
+
 ICONS   = resources/*.png
 
 includes.files = $$HEADERS
 includes.path = ../../include
 
-resources.files = $$ICONS resources/*.qm
+resources.files = $$ICONS
 resources.path = ../../resources
 
 INSTALLS += includes resources