From 6ef3b3cb0907c7d7cd1eef84f123b96ad110faa9 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Fri, 28 May 2010 11:44:31 +0000 Subject: [PATCH] *** empty log message *** --- src/CMakeLists.txt | 2 +- src/creaImageIOGimmick.cpp | 10 +++++----- src/creaImageIOSettings.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5f9b8a8..0ed51e1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) diff --git a/src/creaImageIOGimmick.cpp b/src/creaImageIOGimmick.cpp index fcc38e0..311deba 100644 --- a/src/creaImageIOGimmick.cpp +++ b/src/creaImageIOGimmick.cpp @@ -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) diff --git a/src/creaImageIOSettings.cpp b/src/creaImageIOSettings.cpp index d9d0af3..080a164 100644 --- a/src/creaImageIOSettings.cpp +++ b/src/creaImageIOSettings.cpp @@ -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) ) { -- 2.45.1