New cmake variables for default profile

diff --git a/src/AppQuickStart/app-template/CMakeLists.txt b/src/AppQuickStart/app-template/CMakeLists.txt
index 589425ed5b68ce441dead195e1467e6c33869704..ba99abf4e765b881029d767270e645bfc2f5ac27 100644 (file)
--- a/src/AppQuickStart/app-template/CMakeLists.txt
+++ b/src/AppQuickStart/app-template/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
-PROJECT(Salome<Name_of_Application> C CXX)
+PROJECT(Salome_<Name_of_Application>_Profile C CXX)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
@@ -86,9 +86,9 @@ INCLUDE(${QT_USE_FILE})
 SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH "Install path: SALOME Python scripts")
 
 # Specific to [NAME_OF_APPLICATION]:
-SET(SALOME_[NAME_OF_APPLICATION]_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/(name_of_application)" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] specific data")
-SET(SALOME_[NAME_OF_APPLICATION]_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] gui documentation")
-SET(SALOME_[NAME_OF_APPLICATION]_HTML_STATIC_PATH "${SALOME_[NAME_OF_APPLICATION]_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] html static data")
+SET(SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/(name_of_application)_profile" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] specific data")
+SET(SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] gui documentation")
+SET(SALOME_[NAME_OF_APPLICATION]_PROFILE_HTML_STATIC_PATH "${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] html static data")
 
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_PYTHON)
 

diff --git a/src/AppQuickStart/app-template/doc/CMakeLists.txt b/src/AppQuickStart/app-template/doc/CMakeLists.txt
index 3e956c9ff2b096f336228c2b3a1a08ec029442de..b75081b336c7d4d116299288dde8853f34fe4059 100755 (executable)
--- a/src/AppQuickStart/app-template/doc/CMakeLists.txt
+++ b/src/AppQuickStart/app-template/doc/CMakeLists.txt
@@ -25,7 +25,7 @@ SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cm
 ADD_CUSTOM_TARGET(html_docs COMMAND ${_cmd})
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs)")
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_[NAME_OF_APPLICATION]_INSTALL_DOC_GUI})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_DOC_GUI})
 
 SET(make_clean_files html doctrees)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${make_clean_files}")

diff --git a/src/AppQuickStart/app-template/resources/CMakeLists.txt b/src/AppQuickStart/app-template/resources/CMakeLists.txt
index bd20dae8bebd2bff499fe24b4f6994be1270f8c9..7b70ae1f9dedf97054ac41b13dab188f2dd0d737 100644 (file)
--- a/src/AppQuickStart/app-template/resources/CMakeLists.txt
+++ b/src/AppQuickStart/app-template/resources/CMakeLists.txt
@@ -27,10 +27,10 @@ SET([NAME_OF_APPLICATION]_RESOURCES_FILES
 )
 
 # --- rules ---
-INSTALL(FILES ${[NAME_OF_APPLICATION]_RESOURCES_FILES} DESTINATION ${SALOME_[NAME_OF_APPLICATION]_INSTALL_RES_DATA})
+INSTALL(FILES ${[NAME_OF_APPLICATION]_PROFILE_RESOURCES_FILES} DESTINATION ${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_RES_DATA})
 
 # --- config ---
-SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_[NAME_OF_APPLICATION]_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_RES_DATA})
 
 # --- sub-directories ---
 ADD_SUBDIRECTORY( doc )

diff --git a/src/AppQuickStart/app-template/resources/SalomeApp.xml.in b/src/AppQuickStart/app-template/resources/SalomeApp.xml.in
index 7ccff68b95551e69508230820c4f7e48d4ccb01e..50f91513443fd234286f798f84ea9602283e7206 100644 (file)
--- a/src/AppQuickStart/app-template/resources/SalomeApp.xml.in
+++ b/src/AppQuickStart/app-template/resources/SalomeApp.xml.in
@@ -17,7 +17,7 @@
     <parameter name="standalone" value=""/>
   </section>
   <section name="splash">
-    <parameter name="image" value="%[NAME_OF_APPLICATION]_ROOT_DIR%/share/salome/resources/(name_of_application)/splash.png"/>
+    <parameter name="image" value="%[NAME_OF_APPLICATION]_PROFILE_ROOT_DIR%/share/salome/resources/(name_of_application)/splash.png"/>
     <parameter name="text_colors" value="#ffffff|#000000"/>
     <parameter name="show_percents" value="yes"/>
     <parameter name="show_progress" value="yes"/>
@@ -25,6 +25,6 @@
     <parameter name="font" value="Xirod,12,normal"/>
   </section>
   <section name="resources">
-    <parameter name="LightApp" value="%[NAME_OF_APPLICATION]_ROOT_DIR%/share/salome/resources/(name_of_application)"/>
+    <parameter name="LightApp" value="%[NAME_OF_APPLICATION]_PROFILE_ROOT_DIR%/share/salome/resources/(name_of_application)"/>
   </section>
 </document>

diff --git a/src/AppQuickStart/app-template/resources/doc/CMakeLists.txt b/src/AppQuickStart/app-template/resources/doc/CMakeLists.txt
index 81611cd4a244c272bbd792a44b2756a3e565ee26..1e3735ae5dc706f0eb0a25e57361fa6d95a986ff 100644 (file)
--- a/src/AppQuickStart/app-template/resources/doc/CMakeLists.txt
+++ b/src/AppQuickStart/app-template/resources/doc/CMakeLists.txt
@@ -24,4 +24,4 @@ SET(_bin_DOCUMENTS
    sample.pdf
 )
 
-INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_[NAME_OF_APPLICATION]_INSTALL_DOC_GUI})
+INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_DOC_GUI})

diff --git a/src/AppQuickStart/app-template/src/resources/CMakeLists.txt b/src/AppQuickStart/app-template/src/resources/CMakeLists.txt
index 1d823262460b8716be8e0acb67bc3cdf39252e18..947046b17b500a33146cb22bb9f1b774a771ac6f 100644 (file)
--- a/src/AppQuickStart/app-template/src/resources/CMakeLists.txt
+++ b/src/AppQuickStart/app-template/src/resources/CMakeLists.txt
@@ -30,4 +30,4 @@ SET(_ts_RESOURCES
 
 # --- rules ---
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_[NAME_OF_APPLICATION]_INSTALL_RES_DATA}")
+QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_RES_DATA}")