From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Thu, 11 Mar 2010 10:11:41 +0000 (+0000)
Subject: no message
X-Git-Tag: CREATOOLS.2-0-3~23
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaContours.git;a=commitdiff_plain;h=0005327e5412fb30342ba92456b06be932a11dcc

no message
---

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index ee8c367..dc32ca0 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -140,9 +140,13 @@ bool wxTheApplication :: OnInit()
 	//std::string datadir(  crea::wx2std(GetExecutablePath()) );	
 	std::string datadir(  GetExecutablePath() );
 //JCP
+
+   	    #ifdef LINUX /* assume this is OSX */
+ 		   datadir=datadir+"/../share/creaContours";
+	    #endif // MACOSX	
 	
 		#ifdef MACOSX /* assume this is OSX */
-			datadir=datadir+"/../../..";
+			datadir=datadir+"/../../../../share/creaContours";
 		#endif // MACOSX	
 		
 		
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 370d5a3..8e298ad 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -16,8 +16,7 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 SET(FILE_NAME_DESCRIPTOR "creaContours_Descriptor.dscp")
-CONFIGURE_FILE(	  ${PROJECT_SOURCE_DIR}/data/${FILE_NAME_DESCRIPTOR} ${PROJECT_BINARY_DIR}/bin/Shared/gimmick/${FILE_NAME_DESCRIPTOR}  COPYONLY )
-INSTALL( FILES ${PROJECT_SOURCE_DIR}/data/${FILE_NAME_DESCRIPTOR} DESTINATION bin/Shared/gimmick )
+CONFIGURE_FILE(	  ${PROJECT_SOURCE_DIR}/data/gimmick/${FILE_NAME_DESCRIPTOR} ${PROJECT_BINARY_DIR}/bin/shared/gimmick/${FILE_NAME_DESCRIPTOR}  COPYONLY )
 
 
 
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index c8960dc..cfe309d 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -52,7 +52,7 @@ ENDFOREACH(iLST)
 
 
 IF (WIN32)
-  SET(INSTALL_DATA_DIR "bin/Share/gimmick")
+  SET(INSTALL_DATA_DIR "bin/share/gimmick")
 ELSE (WIN32)
   SET(INSTALL_DATA_DIR "share/gimmick/")
 ENDIF (WIN32)