no message

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index ee8c36703b40264df6944f5358c9476edffffdea..dc32ca0c496dce5aa6ee439ef893c0cef8d53ebe 100644 (file)
--- 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 370d5a367a0d56f1f0e78ab66fcf3be8f61bef72..8e298adf1ddb181a4766c163bf049845ae737382 100644 (file)
--- 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 c8960dc150000772655218471c05b37c691e3c8c..cfe309da1b6eb03a6ff015f9c06c58f8039ab28b 100644 (file)
--- 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)