From 246580c098c017afb4a94cfff47608f99b7de245 Mon Sep 17 00:00:00 2001 From: Camille GOUTTEBROZE Date: Wed, 1 Oct 2014 10:02:40 +0200 Subject: [PATCH] Default profile html static documentation --- bin/app-template/CMakeLists.txt | 9 ++++----- bin/app-template/doc/CMakeLists.txt | 2 +- bin/app-template/doc/conf.py.in | 2 +- bin/app-template/resources/doc/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/app-template/CMakeLists.txt b/bin/app-template/CMakeLists.txt index 942053da2..20c30735e 100644 --- a/bin/app-template/CMakeLists.txt +++ b/bin/app-template/CMakeLists.txt @@ -64,16 +64,15 @@ ENDIF() # Directories # (default values taken from KERNEL) # =========== -SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH - "Install path: SALOME Python scripts") +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 PYHELLO specific data") +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_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] html static data") MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_PYTHON) - # Sources # ======== ADD_SUBDIRECTORY( src ) diff --git a/bin/app-template/doc/CMakeLists.txt b/bin/app-template/doc/CMakeLists.txt index 268da7f54..9cbf0d5b9 100755 --- a/bin/app-template/doc/CMakeLists.txt +++ b/bin/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_INSTALL_DOC}/gui/${PROJECT_NAME_UC}) +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_INSTALL_DOC_GUI}) SET(make_clean_files html doctrees) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${make_clean_files}") diff --git a/bin/app-template/doc/conf.py.in b/bin/app-template/doc/conf.py.in index d73a1ba3c..ed3706ac8 100644 --- a/bin/app-template/doc/conf.py.in +++ b/bin/app-template/doc/conf.py.in @@ -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 = ['@CMAKE_CURRENT_SOURCE_DIR@/_static'] +html_static_path = ['@SALOME_[NAME_OF_APPLICATION]_HTML_STATIC_PATH@'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. diff --git a/bin/app-template/resources/doc/CMakeLists.txt b/bin/app-template/resources/doc/CMakeLists.txt index 59e9649d1..7f485593f 100644 --- a/bin/app-template/resources/doc/CMakeLists.txt +++ b/bin/app-template/resources/doc/CMakeLists.txt @@ -24,4 +24,4 @@ SET(_bin_DOCUMENTS sample.pdf ) -INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}/binaries) +INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_[NAME_OF_APPLICATION]_HTML_STATIC_PATH}) -- 2.39.2