From: vsr Date: Tue, 4 May 2021 07:45:20 +0000 (+0300) Subject: bos #24228 [CEA 24217][Windows] cannot compile SMESH and DOCUMENTATION X-Git-Tag: V9_7_0rc1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV9_7_BR;p=tools%2Fdocumentation.git bos #24228 [CEA 24217][Windows] cannot compile SMESH and DOCUMENTATION --- diff --git a/dev/CMakeLists.txt b/dev/CMakeLists.txt index 35dd2a7..0c6c5b9 100644 --- a/dev/CMakeLists.txt +++ b/dev/CMakeLists.txt @@ -32,9 +32,10 @@ SET(_modules ) FOREACH(_module ${_modules}) - SET(${_module}_ROOT_DIR $ENV{${_module}_ROOT_DIR}) - IF(${_module}_ROOT_DIR) - SALOME_INSTALL_MODULE_DOC(${${_module}_ROOT_DIR}/share/doc/salome/dev/${_module} + SET(_root_dir $ENV{${_module}_ROOT_DIR}) + IF(_root_dir) + FILE(TO_CMAKE_PATH "${_root_dir}/share/doc/salome/dev/${_module}" _doc_path) + SALOME_INSTALL_MODULE_DOC("${_doc_path}" DESTINATION ${SALOME_INSTALL_DOC_DEV}) ENDIF() ENDFOREACH() @@ -44,11 +45,12 @@ ENDFOREACH() SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR}) IF(MEDCOUPLING_ROOT_DIR) - SALOME_INSTALL_MODULE_DOC(${MEDCOUPLING_ROOT_DIR}/share/doc/developer + FILE(TO_CMAKE_PATH "${MEDCOUPLING_ROOT_DIR}" _root_dir) + SALOME_INSTALL_MODULE_DOC("${_root_dir}/share/doc/developer" DESTINATION ${SALOME_INSTALL_DOC_DEV}/MEDCoupling) - SALOME_INSTALL_MODULE_DOC(${MEDCOUPLING_ROOT_DIR}/share/doc/tutorial + SALOME_INSTALL_MODULE_DOC("${_root_dir}/share/doc/tutorial" DESTINATION ${SALOME_INSTALL_DOC_DEV}/MEDCoupling) - SALOME_INSTALL_MODULE_DOC(${MEDCOUPLING_ROOT_DIR}/share/doc/user + SALOME_INSTALL_MODULE_DOC("${_root_dir}/share/doc/user" DESTINATION ${SALOME_INSTALL_DOC_DEV}/MEDCoupling INDEX html) ENDIF() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 038fa14..df17078 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -32,9 +32,10 @@ SET(_modules ) FOREACH(_module ${_modules}) - SET(${_module}_ROOT_DIR $ENV{${_module}_ROOT_DIR}) - IF(${_module}_ROOT_DIR) - SALOME_INSTALL_MODULE_DOC(${${_module}_ROOT_DIR}/share/doc/salome/examples/${_module} + SET(_root_dir $ENV{${_module}_ROOT_DIR}) + IF(_root_dir) + FILE(TO_CMAKE_PATH "${_root_dir}/share/doc/salome/examples/${_module}" _doc_path) + SALOME_INSTALL_MODULE_DOC("${_doc_path}" DESTINATION ${SALOME_INSTALL_DOC_EXAMPLES}) ENDIF() ENDFOREACH() diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 57b25d9..76f35a1 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -41,9 +41,10 @@ SET(_modules ) FOREACH(_module ${_modules}) - SET(${_module}_ROOT_DIR $ENV{${_module}_ROOT_DIR}) - IF(${_module}_ROOT_DIR) - SALOME_INSTALL_MODULE_DOC(${${_module}_ROOT_DIR}/share/doc/salome/gui/${_module} + SET(_root_dir $ENV{${_module}_ROOT_DIR}) + IF(_root_dir) + FILE(TO_CMAKE_PATH "${_root_dir}/share/doc/salome/gui/${_module}" _doc_path) + SALOME_INSTALL_MODULE_DOC("${_doc_path}" DESTINATION ${SALOME_INSTALL_DOC_GUI}) ENDIF() ENDFOREACH() @@ -53,7 +54,8 @@ ENDFOREACH() SET(HOMARD_ROOT_DIR $ENV{HOMARD_ROOT_DIR}) IF(HOMARD_ROOT_DIR) - SALOME_INSTALL_MODULE_DOC(${HOMARD_ROOT_DIR}/share/doc/salome/gui/HOMARD + FILE(TO_CMAKE_PATH "${HOMARD_ROOT_DIR}/share/doc/salome/gui/HOMARD" _doc_path) + SALOME_INSTALL_MODULE_DOC("${_doc_path}" DESTINATION ${SALOME_INSTALL_DOC_GUI} INDEX en fr) ENDIF() @@ -63,7 +65,8 @@ ENDIF() SET(ADAO_ROOT_DIR $ENV{ADAO_ROOT_DIR}) IF(ADAO_ROOT_DIR) - SALOME_INSTALL_MODULE_DOC(${ADAO_ROOT_DIR}/share/doc/gui/ADAO + FILE(TO_CMAKE_PATH "${ADAO_ROOT_DIR}/share/doc/gui/ADAO" _doc_path) + SALOME_INSTALL_MODULE_DOC("${_doc_path}" DESTINATION ${SALOME_INSTALL_DOC_GUI} INDEX en fr) ENDIF() diff --git a/tui/CMakeLists.txt b/tui/CMakeLists.txt index 810a525..6a85b0f 100644 --- a/tui/CMakeLists.txt +++ b/tui/CMakeLists.txt @@ -31,9 +31,10 @@ SET(_modules ) FOREACH(_module ${_modules}) - SET(${_module}_ROOT_DIR $ENV{${_module}_ROOT_DIR}) - IF(${_module}_ROOT_DIR) - SALOME_INSTALL_MODULE_DOC(${${_module}_ROOT_DIR}/share/doc/salome/tui/${_module} + SET(_root_dir $ENV{${_module}_ROOT_DIR}) + IF(_root_dir) + FILE(TO_CMAKE_PATH "${_root_dir}/share/doc/salome/tui/${_module}" _doc_path) + SALOME_INSTALL_MODULE_DOC("${_doc_path}" DESTINATION ${SALOME_INSTALL_DOC_TUI}) ENDIF() ENDFOREACH()