From 6d9ea50f8edd842f6955161563ba0e30b38ef238 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 18 Jun 2015 11:46:45 +0300 Subject: [PATCH] Additional fix for previous commit, to make SALOME_INSTALL_SCRIPTS macro working when installing scripts from root directory --- salome_adm/cmake_files/SalomeMacros.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/salome_adm/cmake_files/SalomeMacros.cmake b/salome_adm/cmake_files/SalomeMacros.cmake index 0463a8a36..898b09531 100644 --- a/salome_adm/cmake_files/SalomeMacros.cmake +++ b/salome_adm/cmake_files/SalomeMacros.cmake @@ -154,7 +154,11 @@ MACRO(SALOME_INSTALL_SCRIPTS file_list path) # get relativa path (from CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR) STRING(REGEX REPLACE ${CMAKE_SOURCE_DIR} "" rel_dir ${CMAKE_CURRENT_SOURCE_DIR}) # convert "/" to "_" - STRING(REGEX REPLACE "/" "_" unique_name ${rel_dir}) + IF(rel_dir) + STRING(REGEX REPLACE "/" "_" unique_name ${rel_dir}) + ELSE(rel_dir) + SET(unique_name _) + ENDIF(rel_dir) ENDFOREACH(file ${file_list}) # Generate only one target for all requested Python script compilation. -- 2.39.2