From: salome-admin Date: Fri, 4 Apr 2014 16:38:37 +0000 (+0400) Subject: Synchronize adm files X-Git-Tag: V7_4_0b1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f96fed49e62dfae726a117b3d4319009e52ce880;p=tools%2Fdocumentation.git Synchronize adm files --- diff --git a/CMakeModules/SalomeMacros.cmake b/CMakeModules/SalomeMacros.cmake index 06dc86b..8c85651 100755 --- a/CMakeModules/SalomeMacros.cmake +++ b/CMakeModules/SalomeMacros.cmake @@ -111,14 +111,12 @@ MACRO(SALOME_INSTALL_SCRIPTS file_list path) ENDIF(NOT SALOME_INSTALL_SCRIPTS_DEF_PERMS) FOREACH(file ${file_list}) SET(PREFIX "") - IF(IS_ABSOLUTE ${file}) - GET_FILENAME_COMPONENT(file_name ${file} NAME) - ELSE() - SET(file_name ${file}) + GET_FILENAME_COMPONENT(file_name ${file} NAME) + IF(NOT IS_ABSOLUTE ${file}) IF(SALOME_INSTALL_SCRIPTS_WORKING_DIRECTORY) - SET(PREFIX "${SALOME_INSTALL_SCRIPTS_WORKING_DIRECTORY}/") + SET(PREFIX "${SALOME_INSTALL_SCRIPTS_WORKING_DIRECTORY}/") ENDIF(SALOME_INSTALL_SCRIPTS_WORKING_DIRECTORY) - ENDIF(IS_ABSOLUTE ${file}) + ENDIF(NOT IS_ABSOLUTE ${file}) INSTALL(FILES ${PREFIX}${file} DESTINATION ${path} PERMISSIONS ${PERMS}) GET_FILENAME_COMPONENT(ext ${file} EXT) IF(ext STREQUAL .py)