From 16eb5b8aa16e578cbc2bca1c10fdd2d28e9a97c4 Mon Sep 17 00:00:00 2001
From: ploix <ploix>
Date: Fri, 19 Mar 2010 16:18:32 +0000
Subject: [PATCH] do not configure SalomeApp.xml so that we can relocate the
 generated module. use PVHOME and PVVERSION runtime env var instead.

---
 resources/CMakeLists.txt                      | 9 +++++----
 resources/{SalomeApp.xml.in => SalomeApp.xml} | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename resources/{SalomeApp.xml.in => SalomeApp.xml} (87%)

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index aebb8c10..f25e07f4 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -46,6 +46,7 @@ SET(dist_salomeres_DATA
     ParaViewReaders.xml
     ParaViewSources.xml
     ParaViewWriters.xml
+    SalomeApp.xml
 )
 
 SET(nodist_salomeres_SCRIPTS
@@ -63,14 +64,14 @@ SET(nodist_salomeres_SCRIPTS
                 CONFIGURE_FILE(${input} ${output})
                 
 
-                SET(input ${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in)
+                #SET(input ${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in)
                 
 
-                SET(output ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml)
+                #SET(output ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml)
                 
 
-                MESSAGE(STATUS "Creation of ${output}")
-                CONFIGURE_FILE(${input} ${output})
+                #MESSAGE(STATUS "Creation of ${output}")
+                #CONFIGURE_FILE(${input} ${output})
                 
 
             FOREACH(dir ${SUBDIRS})
diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml
similarity index 87%
rename from resources/SalomeApp.xml.in
rename to resources/SalomeApp.xml
index 415a47bc..cc032ab1 100644
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml
@@ -11,7 +11,7 @@
     <!-- Module resources -->
     <parameter name="PARAVIS" value="${PARAVIS_ROOT_DIR}/share/salome/resources/paravis"/>
     <!-- ParaView pixmaps -->
-    <parameter name="ParaView" value="${PARAVIEW_INCLUDE_DIRS}/Qt/Components/Resources/Icons"/>
+    <parameter name="ParaView" value="${PVHOME}/include/paraview-${PVVERSION}/Qt/Components/Resources/Icons"/>
   </section>
   <section name="importmed">
     <parameter name="title" value="Load to ParaView"/>
-- 
2.39.2