andreabont/Project-Riddle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
Andrea Bontempi 2012-10-17 17:40:44 +02:00
parent 6f0a11b7d1
commit 7400ee4362
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -6,10 +6,9 @@ set(SYSCONF_INSTALL_DIR
CACHE PATH "Path where to install configuration")
add_subdirectory(commons)
add_subdirectory(libraries)
#Configuration example files
add_subdirectory(config)
add_subdirectory(commons) # Commons libraries.
add_subdirectory(libraries) # Libraries for a single executable
add_subdirectory(config) # Configuration example files
set(LIBRARIES_DIR libraries)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/commons/)

2
README
View file

@ -21,7 +21,7 @@ Installazione
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONF_INSTALL_DIR=/etc
make
make install

2
commons/config.h.in
View file

@ -1 +1 @@
#define FILECONFIG "@SYSCONF_INSTALL_DIR@/ProjectRiddle/breeder.conf"
#define BREEDERCONFIG "@SYSCONF_INSTALL_DIR@/ProjectRiddle/breeder.conf"

6
libraries/libBreeder.cpp
View file

@ -75,7 +75,7 @@ void breederConfig::init()
boost::property_tree::ptree::value_type( "ftp", ftp )
);
boost::property_tree::ini_parser::write_ini( FILECONFIG, root );
boost::property_tree::ini_parser::write_ini( BREEDERCONFIG, root );
}
@ -83,7 +83,7 @@ boost::property_tree::ptree breederConfig::load()
{
boost::property_tree::ptree config;
boost::property_tree::ini_parser::read_ini( FILECONFIG, config );
boost::property_tree::ini_parser::read_ini( BREEDERCONFIG, config );
return config;
@ -92,7 +92,7 @@ boost::property_tree::ptree breederConfig::load()
bool breederConfig::fexists()
{
std::ifstream ifile( FILECONFIG );
std::ifstream ifile( BREEDERCONFIG );
return ifile;
}