Salome HOME
Synchronize adm files V7_4_0b1
authorsalome-admin <admin.salome@opencascade.com>
Fri, 4 Apr 2014 16:38:37 +0000 (20:38 +0400)
committersalome-admin <admin.salome@opencascade.com>
Fri, 4 Apr 2014 16:38:37 +0000 (20:38 +0400)
CMakeModules/SalomeMacros.cmake

index 06dc86b30acaece55565ef853264c8eb966cd8eb..8c85651f31fd1ada802d8544d171b3ad5eb9f237 100755 (executable)
@@ -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)