From: CEA Support SALOME Date: Fri, 4 Dec 2015 10:04:54 +0000 (+0100) Subject: Update cmakeFiles X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=67dc3e892527786e87e2c4542a3dcca5c4e2e01e;p=tools%2FSALOME.git Update cmakeFiles --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 84f696d..ab6fa02 100644 --- a/CMakeLists.txt +++ b/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_SALOME-7.7.0_Profile C CXX) +PROJECT(Salome_SALOME_Profile C CXX) # Ensure a proper linker behavior: CMAKE_POLICY(SET CMP0003 NEW) @@ -48,7 +48,7 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR}) # User options # ============ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) -OPTION(SALOME_BUILD_DOC "Generate SALOME SALOME-7.7.0 documentation" ON) +OPTION(SALOME_BUILD_DOC "Generate SALOME SALOME documentation" ON) IF(SALOME_BUILD_TESTS) ENABLE_TESTING() @@ -90,10 +90,10 @@ INCLUDE(${QT_USE_FILE}) # =========== SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH "Install path: SALOME Python scripts") -# Specific to SALOME-7.7.0: -SET(SALOME_SALOME-7.7.0_PROFILE_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/salome-7.7.0_profile" CACHE PATH "Install path: SALOME SALOME-7.7.0 specific data") -SET(SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME SALOME-7.7.0 gui documentation") -SET(SALOME_SALOME-7.7.0_PROFILE_HTML_STATIC_PATH "${SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME SALOME-7.7.0 html static data") +# Specific to SALOME: +SET(SALOME_SALOME_PROFILE_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/salome_profile" CACHE PATH "Install path: SALOME SALOME specific data") +SET(SALOME_SALOME_PROFILE_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME SALOME gui documentation") +SET(SALOME_SALOME_PROFILE_HTML_STATIC_PATH "${SALOME_SALOME_PROFILE_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME SALOME html static data") MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_PYTHON) @@ -116,4 +116,4 @@ SALOME_INSTALL_SCRIPTS("${_salome_context_API_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_ SET(_salome_context_BASHRC ${KERNEL_ROOT_DIR}/bin/salome/appliskel/.bashrc ) -SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" $ENV{SALOME-7.7.0_PROFILE_ROOT_DIR}) +SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" $ENV{SALOME_PROFILE_ROOT_DIR}) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 1e13d11..c8a2d79 100644 --- a/doc/CMakeLists.txt +++ b/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_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI}) +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_SALOME_PROFILE_INSTALL_DOC_GUI}) SET(make_clean_files html doctrees) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${make_clean_files}") diff --git a/doc/README b/doc/README index da4b551..141459c 100644 --- a/doc/README +++ b/doc/README @@ -1 +1 @@ -This directory contains the sources of SALOME-7.7.0's documentation +This directory contains the sources of SALOME's documentation diff --git a/doc/conf.py.in b/doc/conf.py.in index c0fc22c..db93f5f 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -35,7 +35,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = 'salome-7.7.0' +project = 'salome' copyright = '2010-2015 CEA/DEN, EDF R&D, OPEN CASCADE, ASTEK INDUSTRIE' # The version info for the project you're documenting, acts as replacement for @@ -43,9 +43,9 @@ copyright = '2010-2015 CEA/DEN, EDF R&D, OPEN CASCADE, ASTEK INDUSTRIE' # built documents. # # The short X.Y version. -version = '@SALOMESALOME-7.7.0_MAJOR_VERSION@.@SALOMESALOME-7.7.0_MINOR_VERSION@' +version = '@SALOMESALOME_MAJOR_VERSION@.@SALOMESALOME_MINOR_VERSION@' # The full version, including alpha/beta/rc tags. -release = '@SALOMESALOME-7.7.0_VERSION@' +release = '@SALOMESALOME_VERSION@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -113,7 +113,7 @@ html_theme = 'default' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['@SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI@/_static'] +html_static_path = ['@SALOME_SALOME_PROFILE_INSTALL_DOC_GUI@/_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. @@ -151,7 +151,7 @@ html_use_modindex = False #html_file_suffix = '' # Output file base name for HTML help builder. -htmlhelp_basename = 'salome-7.7.0doc' +htmlhelp_basename = 'salomedoc' # Options for LaTeX output @@ -166,7 +166,7 @@ latex_font_size = '10pt' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). latex_documents = [ - ('index', 'salome-7.7.0.tex', 'SALOME-7.7.0 User Documentation', 'A. Ribes', 'manual') + ('index', 'salome.tex', 'SALOME User Documentation', 'A. Ribes', 'manual') ] # The name of an image file (relative to this directory) to place at the top of diff --git a/doc/index.rst b/doc/index.rst index 49130ca..30c0efa 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -SALOME-7.7.0's documentation +SALOME's documentation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Outline diff --git a/doc/intro.rst b/doc/intro.rst index e33e1ba..2b0692e 100644 --- a/doc/intro.rst +++ b/doc/intro.rst @@ -1,4 +1,4 @@ Introduction ========================================== -Welcome to SALOME-7.7.0's documentation! +Welcome to SALOME's documentation! diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 4f4e765..b1797a9 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -18,7 +18,7 @@ # # --- resources --- -SET(SALOME-7.7.0_PROFILE_RESOURCES_FILES +SET(SALOME_PROFILE_RESOURCES_FILES app_icon.png splash.png about.png @@ -27,10 +27,10 @@ SET(SALOME-7.7.0_PROFILE_RESOURCES_FILES ) # --- rules --- -INSTALL(FILES ${SALOME-7.7.0_PROFILE_RESOURCES_FILES} DESTINATION ${SALOME_SALOME-7.7.0_PROFILE_INSTALL_RES_DATA}) +INSTALL(FILES ${SALOME_PROFILE_RESOURCES_FILES} DESTINATION ${SALOME_SALOME_PROFILE_INSTALL_RES_DATA}) # --- config --- -SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SALOME-7.7.0_PROFILE_INSTALL_RES_DATA}) +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SALOME_PROFILE_INSTALL_RES_DATA}) # --- sub-directories --- ADD_SUBDIRECTORY( doc ) diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index fd8c163..e3831b6 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -16,7 +16,7 @@
- + @@ -24,6 +24,6 @@
- +
diff --git a/resources/doc/CMakeLists.txt b/resources/doc/CMakeLists.txt index ece8261..5852f68 100644 --- a/resources/doc/CMakeLists.txt +++ b/resources/doc/CMakeLists.txt @@ -24,4 +24,4 @@ SET(_bin_DOCUMENTS sample.pdf ) -INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI}) +INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_SALOME_PROFILE_INSTALL_DOC_GUI}) diff --git a/resources/doc/README b/resources/doc/README index 66fd6ed..babce17 100644 --- a/resources/doc/README +++ b/resources/doc/README @@ -1 +1 @@ -This directory contains binaries of SALOME-7.7.0's documentation +This directory contains binaries of SALOME's documentation diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt index 72a8656..812fddc 100644 --- a/src/resources/CMakeLists.txt +++ b/src/resources/CMakeLists.txt @@ -31,4 +31,4 @@ SET(_ts_RESOURCES # --- rules --- -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SALOME-7.7.0_PROFILE_INSTALL_RES_DATA}") +QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SALOME_PROFILE_INSTALL_RES_DATA}") diff --git a/src/resources/LightApp_msg_en.ts b/src/resources/LightApp_msg_en.ts index 48072b0..1c01808 100644 --- a/src/resources/LightApp_msg_en.ts +++ b/src/resources/LightApp_msg_en.ts @@ -9,11 +9,11 @@ ABOUT_CAPTION - About SALOME-7.7.0 + About SALOME APP_NAME - SALOME-7.7.0 + SALOME APP_VERSION @@ -29,7 +29,7 @@ ABOUT_TITLE - SALOME-7.7.0 + SALOME diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts index 539cdef..cbb04b4 100644 --- a/src/resources/LightApp_msg_fr.ts +++ b/src/resources/LightApp_msg_fr.ts @@ -9,15 +9,15 @@ ABOUT_CAPTION - A propos de SALOME-7.7.0 + A propos de SALOME APP_NAME - SALOME-7.7.0 + SALOME APP_VERSION - V7.7.1 + V7.7.0 ABOUT_LICENSE @@ -25,11 +25,11 @@ ABOUT_VERSION - Version 7.7.1 + Version 7.7.0 ABOUT_TITLE - SALOME-7.7.0 + SALOME diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts index c071ae6..2f64b72 100644 --- a/src/resources/LightApp_msg_ja.ts +++ b/src/resources/LightApp_msg_ja.ts @@ -9,15 +9,15 @@ ABOUT_CAPTION - About SALOME-7.7.0 + About SALOME APP_NAME - SALOME-7.7.0 + SALOME APP_VERSION - V7.7.1 + V7.7.0 ABOUT_LICENSE @@ -25,11 +25,11 @@ ABOUT_VERSION - Version 7.7.1 + Version 7.7.0 ABOUT_TITLE - SALOME-7.7.0 + SALOME diff --git a/src/tests/README b/src/tests/README index ee43de0..4976f7e 100644 --- a/src/tests/README +++ b/src/tests/README @@ -1 +1 @@ -This directory contains the tests of SALOME-7.7.0 +This directory contains the tests of SALOME