Merge branch 'master' of https://code.ill.fr/scientific-software/takin/mag-core

tools/scanbrowser/CMakeLists.txt

@@ -71,7 +71,8 @@ set_property(SOURCE
 
 include_directories(
 	"${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/ext" "${PROJECT_SOURCE_DIR}/ext/qcp"
-	"${PROJECT_SOURCE_DIR}/../.." "${PROJECT_SOURCE_DIR}/../../ext" "${PROJECT_SOURCE_DIR}/../../ext/qcp"
+	"${PROJECT_SOURCE_DIR}/../.."
+	"${PROJECT_SOURCE_DIR}/../../ext" "${PROJECT_SOURCE_DIR}/../../ext/qcp"
 	"${PROJECT_SOURCE_DIR}/cli"
 	"${Boost_INCLUDE_DIRS}" "${Boost_INCLUDE_DIRS}/.." "${FLEX_INCLUDE_DIRS}"
 	"${PROJECT_BINARY_DIR}/parser"

tools/scanbrowser/cli/funcs.cpp

@@ -7,8 +7,8 @@
 
 #include "funcs.h"
 #include "../globals.h"
-#include "libs/phys.h"
-#include "libs/fit.h"
+#include "tlibs2/libs/phys.h"
+#include "tlibs2/libs/fit.h"
 
 
 using t_real = t_real_cli;

tools/scanbrowser/cli/sym.cpp

@@ -8,8 +8,8 @@
 #include "cliparser.h"
 #include "../globals.h"
 #include "funcs.h"
-#include "libs/algos.h"
-#include "libs/str.h"
+#include "tlibs2/libs/algos.h"
+#include "tlibs2/libs/str.h"
 
 #include <cmath>