logic: indexer command refactoring

* moved SystemHeaderSearchPaths and FramewordSeearchPaths of indexer cxx indexer commands to CompilerFlags section
* added SourceGroupTestSuite to test indexer command generation of all source groups
* removed "compile_commands.json" from gitignore, because a resource file for the tests has this name

.gitignore

@@ -55,7 +55,6 @@
 .ycm_extra_conf.pyc
 
 sourcetrail.srctrlprj
-compile_commands.json
 
 Makefile
 CMakeLists.txt.user*

bin/test/data/SonargraphProjectTestSuite/CxxCppManualModules/expected_output/output.txt

@@ -1,70 +0,0 @@
-SourceFilePath: "src/tictactoe/src/artificial_player.cpp"
-	IndexedPath: "src/tictactoe/src/artificial_player.cpp"
-	IndexedPath: "test/indexed/header/path"
-	CompilerFlag: "-isystem"
-	CompilerFlag: "src/tictactoe/include"
-	CompilerFlag: "-v"
-	CompilerFlag: "-std=c++17"
-	CompilerFlag: "src/tictactoe/src/artificial_player.cpp"
-	HeaderSearchPath: "test/header/search/path"
-	FrameworkSearchPath: "test/framework/search/path"
-SourceFilePath: "src/tictactoe/src/field.cpp"
-	IndexedPath: "src/tictactoe/src/field.cpp"
-	IndexedPath: "test/indexed/header/path"
-	CompilerFlag: "-isystem"
-	CompilerFlag: "src/tictactoe/include"
-	CompilerFlag: "-v"
-	CompilerFlag: "-std=c++17"
-	CompilerFlag: "src/tictactoe/src/field.cpp"
-	HeaderSearchPath: "test/header/search/path"
-	FrameworkSearchPath: "test/framework/search/path"
-SourceFilePath: "src/tictactoe/src/human_player.cc"
-	IndexedPath: "src/tictactoe/src/human_player.cc"
-	IndexedPath: "test/indexed/header/path"
-	CompilerFlag: "-isystem"
-	CompilerFlag: "src/tictactoe/include"
-	CompilerFlag: "-v"
-	CompilerFlag: "-std=c++17"
-	CompilerFlag: "src/tictactoe/src/human_player.cc"
-	HeaderSearchPath: "test/header/search/path"
-	FrameworkSearchPath: "test/framework/search/path"
-SourceFilePath: "src/tictactoe/src/io.cpp"
-	IndexedPath: "src/tictactoe/src/io.cpp"
-	IndexedPath: "test/indexed/header/path"
-	CompilerFlag: "-isystem"
-	CompilerFlag: "src/tictactoe/include"
-	CompilerFlag: "-v"
-	CompilerFlag: "-std=c++17"
-	CompilerFlag: "src/tictactoe/src/io.cpp"
-	HeaderSearchPath: "test/header/search/path"
-	FrameworkSearchPath: "test/framework/search/path"
-SourceFilePath: "src/tictactoe/src/main.cpp"
-	IndexedPath: "src/tictactoe/src/main.cpp"
-	IndexedPath: "test/indexed/header/path"
-	CompilerFlag: "-isystem"
-	CompilerFlag: "src/tictactoe/include"
-	CompilerFlag: "-v"
-	CompilerFlag: "-std=c++17"
-	CompilerFlag: "src/tictactoe/src/main.cpp"
-	HeaderSearchPath: "test/header/search/path"
-	FrameworkSearchPath: "test/framework/search/path"
-SourceFilePath: "src/tictactoe/src/player.cpp"
-	IndexedPath: "src/tictactoe/src/player.cpp"
-	IndexedPath: "test/indexed/header/path"
-	CompilerFlag: "-isystem"
-	CompilerFlag: "src/tictactoe/include"
-	CompilerFlag: "-v"
-	CompilerFlag: "-std=c++17"
-	CompilerFlag: "src/tictactoe/src/player.cpp"
-	HeaderSearchPath: "test/header/search/path"
-	FrameworkSearchPath: "test/framework/search/path"
-SourceFilePath: "src/tictactoe/src/tictactoe.cpp"
-	IndexedPath: "src/tictactoe/src/tictactoe.cpp"
-	IndexedPath: "test/indexed/header/path"
-	CompilerFlag: "-isystem"
-	CompilerFlag: "src/tictactoe/include"
-	CompilerFlag: "-v"
-	CompilerFlag: "-std=c++17"
-	CompilerFlag: "src/tictactoe/src/tictactoe.cpp"
-	HeaderSearchPath: "test/header/search/path"
-	FrameworkSearchPath: "test/framework/search/path"

bin/test/data/SourceGroupTestSuite/cxx_c_empty/expected_output/output.txt

@@ -0,0 +1,17 @@
+SourceFilePath: "src/Test.c"
+	IndexedPath: "src"
+	CompilerFlag: "--target=test_arch-test_vendor-test_sys-test_abi"
+	CompilerFlag: "-std=c11"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "src"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "header_search/local"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "test/header/search/path"
+	CompilerFlag: "-iframework"
+	CompilerFlag: "framework_search/local"
+	CompilerFlag: "-iframework"
+	CompilerFlag: "test/framework/search/path"
+	CompilerFlag: "-local-flag"
+	CompilerFlag: "src/Test.c"
+	ExcludeFilter: "**/excluded/**"

bin/test/data/SourceGroupTestSuite/cxx_cdb/expected_output/output.txt

@@ -0,0 +1,24 @@
+SourceFilePath: "src/Test.cpp"
+	IndexedPath: "src/Test.cpp"
+	IndexedPath: "test/indexed/header/path"
+	CompilerFlag: "clang-tool"
+	CompilerFlag: "-fms-extensions"
+	CompilerFlag: "-fms-compatibility"
+	CompilerFlag: "-fms-compatibility-version=19"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "'/include/path/from/cdb'"
+	CompilerFlag: "-D"
+	CompilerFlag: "DEFINE_FROM_CDB=some_value"
+	CompilerFlag: "-std=c++14"
+	CompilerFlag: "/FS"
+	CompilerFlag: "'./Test.cpp'"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "header_search/local"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "test/header/search/path"
+	CompilerFlag: "-iframework"
+	CompilerFlag: "framework_search/local"
+	CompilerFlag: "-iframework"
+	CompilerFlag: "test/framework/search/path"
+	CompilerFlag: "-local-flag"
+	ExcludeFilter: "**/excluded/**"

bin/test/data/SourceGroupTestSuite/cxx_cdb/input/compile_commands.json

@@ -0,0 +1,7 @@
+[
+	{
+		"directory": "src",
+		"command": "clang-tool -fms-extensions -fms-compatibility -fms-compatibility-version=19  -isystem '/include/path/from/cdb'  -D DEFINE_FROM_CDB=\"some_value\" -std=c++14  /FS  './Test.cpp'",
+		"file": "./Test.cpp"
+	}
+]

bin/test/data/SourceGroupTestSuite/cxx_codeblocks/expected_output/output.txt

@@ -0,0 +1,18 @@
+SourceFilePath: "src/Test.cpp"
+	IndexedPath: "src/Test.cpp"
+	IndexedPath: "test/indexed/header/path"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "src/header/search/path/from/cbp"
+	CompilerFlag: "-DDEFINE_FROM_CBP"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "header_search/local"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "test/header/search/path"
+	CompilerFlag: "-iframework"
+	CompilerFlag: "framework_search/local"
+	CompilerFlag: "-iframework"
+	CompilerFlag: "test/framework/search/path"
+	CompilerFlag: "-local-flag"
+	CompilerFlag: "-std=c++11"
+	CompilerFlag: "src/Test.cpp"
+	ExcludeFilter: "**/excluded/**"

bin/test/data/SourceGroupTestSuite/cxx_codeblocks/input/project.cbp.in

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6"/>
+	<Project>
+		<Option title="Test"/>
+		<Option makefile_is_custom="1"/>
+		<Option compiler="msvc8"/>
+		<Option virtualFolders="CMake Files\;"/>
+		<Build>
+			<Target title="all">
+				<Option working_dir="<source_path>"/>
+				<Option type="4"/>
+				<MakeCommands>
+					<Build command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 all"/>
+					<CompileFile command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 &quot;$file&quot;"/>
+					<Clean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+					<DistClean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+				</MakeCommands>
+			</Target>
+			<Target title="Test">
+				<Option output="<source_path>/Test.exe" prefix_auto="0" extension_auto="0"/>
+				<Option working_dir="<source_path>"/>
+				<Option object_output="./"/>
+				<Option type="1"/>
+				<Option compiler="msvc8"/>
+				<Compiler>
+					<Add option="-DDEFINE_FROM_CBP" />
+					<Add directory="<source_path>/header/search/path/from/cbp"/>
+				</Compiler>
+				<MakeCommands>
+					<Build command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 Test"/>
+					<CompileFile command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 &quot;$file&quot;"/>
+					<Clean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+					<DistClean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+				</MakeCommands>
+			</Target>
+			<Target title="Test/fast">
+				<Option output="<source_path>/Test.exe" prefix_auto="0" extension_auto="0"/>
+				<Option working_dir="<source_path>"/>
+				<Option object_output="./"/>
+				<Option type="1"/>
+				<Option compiler="msvc8"/>
+				<Compiler>
+					<Add directory="<source_path>/include"/>
+				</Compiler>
+				<MakeCommands>
+					<Build command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 Test/fast"/>
+					<CompileFile command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 &quot;$file&quot;"/>
+					<Clean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+					<DistClean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+				</MakeCommands>
+			</Target>
+			<Target title="edit_cache">
+				<Option working_dir="<source_path>"/>
+				<Option type="4"/>
+				<MakeCommands>
+					<Build command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 edit_cache"/>
+					<CompileFile command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 &quot;$file&quot;"/>
+					<Clean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+					<DistClean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+				</MakeCommands>
+			</Target>
+			<Target title="rebuild_cache">
+				<Option working_dir="<source_path>"/>
+				<Option type="4"/>
+				<MakeCommands>
+					<Build command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 rebuild_cache"/>
+					<CompileFile command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 &quot;$file&quot;"/>
+					<Clean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+					<DistClean command="nmake /NOLOGO /f <source_path>\Makefile VERBOSE=1 clean"/>
+				</MakeCommands>
+			</Target>
+		</Build>
+		<Unit filename="<source_path>/Test.cpp">
+			<Option target="Test"/>
+		</Unit>
+		<Unit filename="<source_path>/CMakeLists.txt">
+			<Option virtualFolder="CMake Files\"/>
+		</Unit>
+	</Project>
+</CodeBlocks_project_file>

bin/test/data/SourceGroupTestSuite/cxx_cpp_empty/expected_output/output.txt

@@ -0,0 +1,19 @@
+SourceFilePath: "src/Test.cpp"
+	IndexedPath: "src"
+	CompilerFlag: "--target=test_arch-test_vendor-test_sys-test_abi"
+	CompilerFlag: "-std=c++11"
+	CompilerFlag: "-x"
+	CompilerFlag: "c++"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "src"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "header_search/local"
+	CompilerFlag: "-isystem"
+	CompilerFlag: "test/header/search/path"
+	CompilerFlag: "-iframework"
+	CompilerFlag: "framework_search/local"
+	CompilerFlag: "-iframework"
+	CompilerFlag: "test/framework/search/path"
+	CompilerFlag: "-local-flag"
+	CompilerFlag: "src/Test.cpp"
+	ExcludeFilter: "**/excluded/**"

bin/test/data/SourceGroupTestSuite/cxx_sonargraph_cmake_json/input/sonargraph/system.sonargraph

@@ -3,7 +3,7 @@
     <description></description>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="Foundation" id="4152aded03a38d56f21c0c8250f829e5" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./Foundation/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/Foundation/src">
             <sourceFile compilerOptionSetId="0" fileName="./AbstractObserver.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="0" fileName="./ActiveDispatcher.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="0" fileName="./ArchiveStrategy.cpp"></sourceFile>
@@ -190,7 +190,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="XML" id="9ef5d881e5b5e637c9fbfa8c41d3d57e" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./XML/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/XML/src">
             <sourceFile compilerOptionSetId="1" fileName="./AbstractContainerNode.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="1" fileName="./AbstractNode.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="1" fileName="./Attr.cpp"></sourceFile>
@@ -267,7 +267,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="JSON" id="68de4aa4dac693305f37877732f3897e" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./JSON/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/JSON/src">
             <sourceFile compilerOptionSetId="2" fileName="./Array.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="2" fileName="./Handler.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="2" fileName="./JSONException.cpp"></sourceFile>
@@ -283,7 +283,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="MongoDB" id="0f4e83045501563f323381214a26695d" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./MongoDB/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/MongoDB/src">
             <sourceFile compilerOptionSetId="3" fileName="./Array.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="3" fileName="./Binary.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="3" fileName="./Connection.cpp"></sourceFile>
@@ -309,7 +309,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="Util" id="31cf178eb745b68b72adf0491de8e51d" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./Util/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/Util/src">
             <sourceFile compilerOptionSetId="4" fileName="./AbstractConfiguration.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="4" fileName="./Application.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="4" fileName="./ConfigurationMapper.cpp"></sourceFile>
@@ -341,7 +341,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="Net" id="17007d64582fe066274cbb04c385781e" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./Net/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/Net/src">
             <sourceFile compilerOptionSetId="5" fileName="./AbstractHTTPRequestHandler.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="5" fileName="./DatagramSocket.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="5" fileName="./DatagramSocketImpl.cpp"></sourceFile>
@@ -445,7 +445,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="Data" id="8d1b2342d3e64c1f9c9140b110485206" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./Data/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/Data/src">
             <sourceFile compilerOptionSetId="6" fileName="./AbstractBinder.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="6" fileName="./AbstractBinding.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="6" fileName="./AbstractExtraction.cpp"></sourceFile>
@@ -485,7 +485,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="SQLLite" id="9be362dcc09b6acb1f035696e0193b2c" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./Data/SQLite/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/Data/SQLite/src">
             <sourceFile compilerOptionSetId="7" fileName="./Binder.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="7" fileName="./Connector.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="7" fileName="./Extractor.cpp"></sourceFile>
@@ -499,7 +499,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="Zip" id="573d0fb5c14cb4ecf11f126723603a7b" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./Zip/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/Zip/src">
             <sourceFile compilerOptionSetId="8" fileName="./Add.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="8" fileName="./AutoDetectStream.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="8" fileName="./Compress.cpp"></sourceFile>
@@ -526,7 +526,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="PageCompiler" id="92f7608c6c437fecef60b7f33c24b4f8" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./PageCompiler/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/PageCompiler/src">
             <sourceFile compilerOptionSetId="9" fileName="./ApacheCodeWriter.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="9" fileName="./CodeWriter.cpp"></sourceFile>
             <sourceFile compilerOptionSetId="9" fileName="./OSPCodeWriter.cpp"></sourceFile>
@@ -537,7 +537,7 @@
     </module>
     <module xmlns:ns4="http://www.hello2morrow.com/sonargraph/languageprovider/cplusplus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns4:xsdCmakeJsonModule" name="File2Page" id="743174a01a27658a3e9f06c71597bce5" language="CPlusPlus">
         <description></description>
-        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./PageCompiler/File2Page/src">
+        <rootPath xsi:type="ns4:xsdRootPathWithFiles" name="./src/PageCompiler/File2Page/src">
             <sourceFile compilerOptionSetId="9" fileName="./File2Page.cpp"></sourceFile>
         </rootPath>
     </module>
@@ -553,8 +553,8 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./Foundation/include</option>
-            <option>-I./Foundation/src</option>
+            <option>-I./src/Foundation/include</option>
+            <option>-I./src/Foundation/src</option>
         </compilerOptionSets>
         <compilerOptionSets id="1">
             <option>-DHAVE_EXPAT_CONFIG_H</option>
@@ -568,9 +568,9 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./XML/include</option>
-            <option>-I./XML/src</option>
-            <option>-I./Foundation/include</option>
+            <option>-I./src/XML/include</option>
+            <option>-I./src/XML/src</option>
+            <option>-I./src/Foundation/include</option>
         </compilerOptionSets>
         <compilerOptionSets id="2">
             <option>-DJSON_EXPORTS</option>
@@ -581,9 +581,9 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./JSON/include</option>
-            <option>-I./JSON/src</option>
-            <option>-I./Foundation/include</option>
+            <option>-I./src/JSON/include</option>
+            <option>-I./src/JSON/src</option>
+            <option>-I./src/Foundation/include</option>
         </compilerOptionSets>
         <compilerOptionSets id="3">
             <option>-DMongoDB_EXPORTS</option>
@@ -594,10 +594,10 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./MongoDB/include</option>
-            <option>-I./MongoDB/src</option>
-            <option>-I./Net/include</option>
-            <option>-I./Foundation/include</option>
+            <option>-I./src/MongoDB/include</option>
+            <option>-I./src/MongoDB/src</option>
+            <option>-I./src/Net/include</option>
+            <option>-I./src/Foundation/include</option>
         </compilerOptionSets>
         <compilerOptionSets id="4">
             <option>-DPOCO_HAVE_IPv6</option>
@@ -608,11 +608,11 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./Util/include</option>
-            <option>-I./Util/src</option>
-            <option>-I./Foundation/include</option>
-            <option>-I./XML/include</option>
-            <option>-I./JSON/include</option>
+            <option>-I./src/Util/include</option>
+            <option>-I./src/Util/src</option>
+            <option>-I./src/Foundation/include</option>
+            <option>-I./src/XML/include</option>
+            <option>-I./src/JSON/include</option>
         </compilerOptionSets>
         <compilerOptionSets id="5">
             <option>-DNet_EXPORTS</option>
@@ -623,9 +623,9 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./Net/include</option>
-            <option>-I./Net/src</option>
-            <option>-I./Foundation/include</option>
+            <option>-I./src/Net/include</option>
+            <option>-I./src/Net/src</option>
+            <option>-I./src/Foundation/include</option>
         </compilerOptionSets>
         <compilerOptionSets id="6">
             <option>-DData_EXPORTS</option>
@@ -637,9 +637,9 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./Data/include</option>
-            <option>-I./Data/src</option>
-            <option>-I./Foundation/include</option>
+            <option>-I./src/Data/include</option>
+            <option>-I./src/Data/src</option>
+            <option>-I./src/Foundation/include</option>
         </compilerOptionSets>
         <compilerOptionSets id="7">
             <option>-DPOCO_HAVE_IPv6</option>
@@ -658,10 +658,10 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./Data/SQLite/include</option>
-            <option>-I./Data/SQLite/src</option>
-            <option>-I./Foundation/include</option>
-            <option>-I./Data/include</option>
+            <option>-I./src/Data/SQLite/include</option>
+            <option>-I./src/Data/SQLite/src</option>
+            <option>-I./src/Foundation/include</option>
+            <option>-I./src/Data/include</option>
         </compilerOptionSets>
         <compilerOptionSets id="8">
             <option>-DPOCO_HAVE_IPv6</option>
@@ -672,12 +672,12 @@
             <option>-g</option>
             <option>-DNDEBUG</option>
             <option>-fPIC</option>
-            <option>-I./Zip/include</option>
-            <option>-I./Zip/src</option>
-            <option>-I./Util/include</option>
-            <option>-I./Foundation/include</option>
-            <option>-I./XML/include</option>
-            <option>-I./JSON/include</option>
+            <option>-I./src/Zip/include</option>
+            <option>-I./src/Zip/src</option>
+            <option>-I./src/Util/include</option>
+            <option>-I./src/Foundation/include</option>
+            <option>-I./src/XML/include</option>
+            <option>-I./src/JSON/include</option>
         </compilerOptionSets>
         <compilerOptionSets id="9">
             <option>-DPOCO_HAVE_IPv6</option>
@@ -688,11 +688,11 @@
             <option>-DNDEBUG</option>
             <option>-I../../../../usr/include/apache2</option>
             <option>-I../../../../usr/include/apr-1</option>
-            <option>-I./Net/include</option>
-            <option>-I./Foundation/include</option>
-            <option>-I./Util/include</option>
-            <option>-I./XML/include</option>
-            <option>-I./JSON/include</option>
+            <option>-I./src/Net/include</option>
+            <option>-I./src/Foundation/include</option>
+            <option>-I./src/Util/include</option>
+            <option>-I./src/XML/include</option>
+            <option>-I./src/JSON/include</option>
         </compilerOptionSets>
     </systemExtension>
 </ns2:softwareSystem>