]> Creatis software - creaImageIO.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 28 May 2010 11:44:31 +0000 (11:44 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 28 May 2010 11:44:31 +0000 (11:44 +0000)
src/CMakeLists.txt
src/creaImageIOGimmick.cpp
src/creaImageIOSettings.cpp

index 5f9b8a8ba87fb467d445db9db7d277ca06bdafa7..0ed51e11c6ae10a2bf9ec610b77dc98f8798f358 100644 (file)
@@ -245,7 +245,7 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 IF (WIN32)
        SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
-       SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/Shared/gimmick)
+       SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/gimmick)
 ELSE (WIN32)
        SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
        SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
index fcc38e076481bec00e4ecc3bc0f9144c49543e5c..311deba6982023ec0829f845965d3c59c0d5c58a 100644 (file)
@@ -62,14 +62,14 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/");
+    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"share/gimmick/");
 
     mSettings  = new Settings(mCurrentDirectory);
        
     std::string dbpath = GetLocalDatabasePath();
 
     // Create or open local database
-    std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/" + mLocalDescpName;
+    std::string dpath= mCurrentDirectory + "/.gimmick/share/gimmick/" + mLocalDescpName;
        
     boost::algorithm::replace_all( dpath,
                                   INVALID_FILE_SEPARATOR , 
@@ -202,7 +202,7 @@ namespace creaImageIO
     if (mLocalDatabasePath.size()==0) 
       {
        mLocalDatabasePath = GetUserSettingsDirectory();
-       mLocalDatabasePath += "Shared/gimmick/";
+       mLocalDatabasePath += "share/gimmick/";
        mLocalDatabasePath += mLocalDBName;
        mLocalDatabasePath +=".sqlite3";
        boost::algorithm::replace_all( mLocalDatabasePath,
@@ -257,7 +257,7 @@ namespace creaImageIO
        boost::algorithm::replace_all( setDir,
                                       INVALID_FILE_SEPARATOR , 
                                       VALID_FILE_SEPARATOR);
-       setDir+="Shared/";
+       setDir+="share/";
        boost::filesystem::create_directory( setDir );
        setDir+="gimmick/";
        boost::filesystem::create_directory( setDir );
@@ -277,7 +277,7 @@ namespace creaImageIO
 // The following stuff works on Linux, NOT CHECKED on Windows // JPR
                
 #if defined(_WIN32)            
-               path+="/bin/Shared/gimmick/";
+               path+="/bin/share/gimmick/";
 #endif
 
 #if defined (LINUX)
index d9d0af36baa014e0f8e2055c9e6d42ecbf2eac83..080a164c7bb3accc5d81ebcaedc6d032b7c22f49 100644 (file)
@@ -16,7 +16,7 @@ namespace creaImageIO
     Settings::Settings(const std::string i_path)
     {
         //need to position path in user directory first.
-        m_SettingsFileName = i_path + "\\.gimmick\\Shared\\gimmick\\app.config";
+        m_SettingsFileName = i_path + "\\.gimmick\\share\\gimmick\\app.config";
         //Test if Settings File exist
         if(!boost::filesystem::exists(m_SettingsFileName) )
         {