From: Romulo Pinho <pinho@lyon.fnclcc.fr>
Date: Fri, 5 Aug 2011 10:51:45 +0000 (+0200)
Subject: more name conflicts
X-Git-Tag: v1.3.0~240^2~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=66d21002b1ea9e439731fa624836705f8bc34847;p=clitk.git

more name conflicts
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abd2d3e..48f1257 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ ENDIF(BUILD_TESTING)
 #=========================================================
 # Install scripts when running make install
 SET(SCRIPTS 
-  scripts/common.sh
+  scripts/midp_common.sh
   scripts/registration.sh
   scripts/create_midP.sh
   scripts/create_midP-2.0.sh        
diff --git a/scripts/create_midP-2.0.sh b/scripts/create_midP-2.0.sh
index 8b53008..93290c8 100755
--- a/scripts/create_midP-2.0.sh
+++ b/scripts/create_midP-2.0.sh
@@ -21,7 +21,7 @@
 
 source `dirname $0`/create_midP_masks-2.0.sh using-as-lib 2 nn
 source `dirname $0`/registration.sh
-source `dirname $0`/common.sh
+source `dirname $0`/midp_common.sh
 
 registration()
 {
diff --git a/scripts/create_midP.sh b/scripts/create_midP.sh
index 164fb5e..7591efb 100755
--- a/scripts/create_midP.sh
+++ b/scripts/create_midP.sh
@@ -3,7 +3,7 @@
 #################################################################
 # create_MidP 	arguments : CT_4D.mhd ref_phase spacing 	#
 #################################################################
-source `dirname $0`/common.sh
+source `dirname $0`/midp_common.sh
 
 extract_patient()
 {
diff --git a/scripts/create_midP_masks-2.0.sh b/scripts/create_midP_masks-2.0.sh
index 6023df5..68560ca 100755
--- a/scripts/create_midP_masks-2.0.sh
+++ b/scripts/create_midP_masks-2.0.sh
@@ -15,7 +15,7 @@
 #
 ###############################################################################
 
-source `dirname $0`/common.sh
+source `dirname $0`/midp_common.sh
 
 extract_patient()
 {
diff --git a/scripts/create_midP_masks.sh b/scripts/create_midP_masks.sh
index 471ce6b..845237d 100755
--- a/scripts/create_midP_masks.sh
+++ b/scripts/create_midP_masks.sh
@@ -1,6 +1,6 @@
 #! /bin/bash -x
 
-source `dirname $0`/common.sh
+source `dirname $0`/midp_common.sh
 
 extract_patient()
 {
diff --git a/scripts/midp_common.sh b/scripts/midp_common.sh
index 73d1787..0f76707 100755
--- a/scripts/midp_common.sh
+++ b/scripts/midp_common.sh
@@ -2,7 +2,7 @@
 
 ###############################################################################
 #
-# FILE: common.sh
+# FILE: midp_common.sh
 # AUTHOR: Rômulo Pinho 05/08/2011
 #
 # Helper file with many functions used in the midP scripts.