do not configure SalomeApp.xml so that we can relocate the generated module.

use PVHOME and PVVERSION runtime env var instead.

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index aebb8c101ddac2ab432f86d1bffb38410ee9684b..f25e07f457ad98e4e6621998ce14ddbd17c4b0d7 100644 (file)
--- 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 b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..cc032ab
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,21 @@
+<document>
+  <section name="PARAVIS">
+    <!-- Major module parameters -->
+    <parameter name="name" value="ParaViS"/>
+    <parameter name="icon" value="pqAppIcon22.png"/>
+    <parameter name="singleton" value="true"/>
+    <!-- Lists all additional popup items separated by ':' -->
+    <parameter name="popupitems" value="importmed"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="PARAVIS" value="${PARAVIS_ROOT_DIR}/share/salome/resources/paravis"/>
+    <!-- ParaView pixmaps -->
+    <parameter name="ParaView" value="${PVHOME}/include/paraview-${PVVERSION}/Qt/Components/Resources/Icons"/>
+  </section>
+  <section name="importmed">
+    <parameter name="title" value="Load to ParaView"/>
+    <parameter name="objectid" value="VISU.RESULT"/>
+    <parameter name="method" value="onImportFromVisu"/>
+  </section>
+</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
deleted file mode 100644 (file)
index 415a47b..0000000
--- a/resources/SalomeApp.xml.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<document>
-  <section name="PARAVIS">
-    <!-- Major module parameters -->
-    <parameter name="name" value="ParaViS"/>
-    <parameter name="icon" value="pqAppIcon22.png"/>
-    <parameter name="singleton" value="true"/>
-    <!-- Lists all additional popup items separated by ':' -->
-    <parameter name="popupitems" value="importmed"/>
-  </section>
-  <section name="resources">
-    <!-- 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"/>
-  </section>
-  <section name="importmed">
-    <parameter name="title" value="Load to ParaView"/>
-    <parameter name="objectid" value="VISU.RESULT"/>
-    <parameter name="method" value="onImportFromVisu"/>
-  </section>
-</document>