diff --git a/script/buildonly.sh b/script/buildonly.sh index f51df337..0be11df7 100755 --- a/script/buildonly.sh +++ b/script/buildonly.sh @@ -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; diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp index c9aabcfd..ccea3235 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp @@ -1,5 +1,7 @@ #include "QtProjectWizardContentPathsHeaderSearch.h" +#include + #include #include "Application.h" diff --git a/src/test/test_main.cpp b/src/test/test_main.cpp index e2b12c4c..3262d937 100644 --- a/src/test/test_main.cpp +++ b/src/test/test_main.cpp @@ -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