build: Fixed Linux build
This commit is contained in:
+12
-1
@@ -9,7 +9,18 @@ cd $MY_PATH/..
|
||||
# run setup script if needed
|
||||
if [ ! -d "build/Release" ]
|
||||
then
|
||||
$MY_PATH/setup.sh
|
||||
echo "configure builds"
|
||||
|
||||
mkdir -p build/Debug
|
||||
cd build/Debug
|
||||
cmake -G Ninja -DCMAKE_BUILD_TYPE="Debug" ../..
|
||||
cd ../..
|
||||
|
||||
mkdir -p build/Release
|
||||
cd build/Release
|
||||
cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" ../..
|
||||
cd ../..
|
||||
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
exit 1;
|
||||
|
||||
+2
@@ -1,5 +1,7 @@
|
||||
#include "QtProjectWizardContentPathsHeaderSearch.h"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
#include <QMessageBox>
|
||||
|
||||
#include "Application.h"
|
||||
|
||||
@@ -17,19 +17,17 @@ struct EventListener : Catch::TestEventListenerBase
|
||||
if (!homedir.empty())
|
||||
{
|
||||
if(!ApplicationSettings::getInstance()->load(
|
||||
FilePath(homedir + "/.config/sourcetrail/ApplicationSettings.xml")
|
||||
))
|
||||
FilePath(homedir + "/.config/sourcetrail/ApplicationSettings.xml")))
|
||||
{
|
||||
std::cout << "no settings" << std::endl;
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "no homedir" << std::endl;
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
|
||||
#else
|
||||
ApplicationSettings::getInstance()->load(FilePath(L"data/TestSettings.xml"));
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user