bos #26460 Merge branch 'occ/ssl'

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index bb89d4a8fe4a242ab58399daa825c7df0948c7dd..929bab817caf74628654f499e0ea10b3161365d6 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -24,8 +24,9 @@ SET(ATOMIC_RESOURCES_FILES
   atom.png
   ATOMIC.png
   sample.xml
-  SalomeApp.xml
 )
 
 INSTALL(FILES ${ATOMIC_RESOURCES_FILES} DESTINATION ${SALOME_ATOMIC_INSTALL_RES_DATA})
 SALOME_CONFIGURE_FILE(LightApp.xml.in LightApp.xml INSTALL ${SALOME_ATOMIC_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(SalomeApp.xml.in SalomeApp.xml INSTALL ${SALOME_ATOMIC_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(SalomeApp.xml.in SalomeAppSL.xml INSTALL ${SALOME_ATOMIC_INSTALL_RES_DATA})

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
deleted file mode 100644 (file)
index 276f164..0000000
--- a/resources/SalomeApp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE document>
-<document>
-  <import name="LightApp"/>
-</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
new file mode 100644 (file)
index 0000000..276f164
--- /dev/null
+++ b/resources/SalomeApp.xml.in
@@ -0,0 +1,4 @@
+<!DOCTYPE document>
+<document>
+  <import name="LightApp"/>
+</document>