build: search headers in all source directories

* removed paths in include directives
* changed cmake to provide necessary header search paths
* changed name of version.h to productVersion.h due to name conflict

src/lib_gui/utility/path_detector/CombinedPathDetector.cpp

@@ -1,6 +1,6 @@
-#include "utility/path_detector/CombinedPathDetector.h"
+#include "CombinedPathDetector.h"
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 CombinedPathDetector::CombinedPathDetector()
 	: PathDetector("combined")

src/lib_gui/utility/path_detector/CombinedPathDetector.h

@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "utility/path_detector/PathDetector.h"
+#include "PathDetector.h"
 
 class CombinedPathDetector: public PathDetector
 {

src/lib_gui/utility/path_detector/PathDetector.cpp

@@ -1,6 +1,6 @@
-#include "utility/path_detector/PathDetector.h"
+#include "PathDetector.h"
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 PathDetector::PathDetector(const std::string& name)
 	: m_name(name)

src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp

@@ -1,8 +1,8 @@
-#include "utility/path_detector/cxx_header/CxxFrameworkPathDetector.h"
+#include "CxxFrameworkPathDetector.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h"
-#include "utility/utilityString.h"
+#include "FilePath.h"
+#include "utilityCxxHeaderDetection.h"
+#include "utilityString.h"
 
 CxxFrameworkPathDetector::CxxFrameworkPathDetector(const std::string& compilerName)
 	: PathDetector(compilerName)

src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.h

@@ -1,7 +1,7 @@
 #ifndef CXX_FRAMEWORK_PATH_DETECTOR_H
 #define CXX_FRAMEWORK_PATH_DETECTOR_H
 
-#include "utility/path_detector/PathDetector.h"
+#include "PathDetector.h"
 
 class CxxFrameworkPathDetector: public PathDetector
 {

src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp

@@ -1,9 +1,9 @@
-#include "utility/path_detector/cxx_header/CxxHeaderPathDetector.h"
+#include "CxxHeaderPathDetector.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h"
-#include "utility/utilityString.h"
-#include "utility/utilityCxx.h"
+#include "FilePath.h"
+#include "utilityCxxHeaderDetection.h"
+#include "utilityString.h"
+#include "utilityCxx.h"
 
 CxxHeaderPathDetector::CxxHeaderPathDetector(const std::string& compilerName)
 	: PathDetector(compilerName)

src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.h

@@ -1,7 +1,7 @@
 #ifndef CXX_HEADER_PATH_DETECTOR_H
 #define CXX_HEADER_PATH_DETECTOR_H
 
-#include "utility/path_detector/PathDetector.h"
+#include "PathDetector.h"
 
 class CxxHeaderPathDetector: public PathDetector
 {

src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp

@@ -1,14 +1,14 @@
-#include "utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h"
+#include "CxxVs10To14HeaderPathDetector.h"
 
 #include <string>
 
 #include <QSettings>
 #include <QSysInfo>
 
-#include "utility/file/FilePath.h"
-#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h"
-#include "utility/utility.h"
-#include "utility/utilityCxx.h"
+#include "FilePath.h"
+#include "utilityCxxHeaderDetection.h"
+#include "utility.h"
+#include "utilityCxx.h"
 
 CxxVs10To14HeaderPathDetector::CxxVs10To14HeaderPathDetector(VisualStudioType type, bool isExpress, ApplicationArchitectureType architecture)
 	: PathDetector(visualStudioTypeToString(type) + (isExpress ? " Express" : "") + (architecture == APPLICATION_ARCHITECTURE_X86_64 ? " 64 Bit" : ""))

src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h

@@ -1,8 +1,8 @@
 #ifndef CXX_VS_10_TO_14_HEADER_PATH_DETECTOR_H
 #define CXX_VS_10_TO_14_HEADER_PATH_DETECTOR_H
 
-#include "utility/path_detector/PathDetector.h"
-#include "utility/ApplicationArchitectureType.h"
+#include "PathDetector.h"
+#include "ApplicationArchitectureType.h"
 
 class CxxVs10To14HeaderPathDetector : public PathDetector
 {

src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp

@@ -1,13 +1,13 @@
-#include "utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h"
+#include "CxxVs15HeaderPathDetector.h"
 
 #include <string>
 
-#include "utility/file/FilePath.h"
-#include "utility/file/FileSystem.h"
-#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h"
-#include "utility/utility.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityCxx.h"
+#include "FilePath.h"
+#include "FileSystem.h"
+#include "utilityCxxHeaderDetection.h"
+#include "utility.h"
+#include "utilityApp.h"
+#include "utilityCxx.h"
 
 CxxVs15HeaderPathDetector::CxxVs15HeaderPathDetector()
 	: PathDetector("Visual Studio 2017")

src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h

@@ -1,8 +1,8 @@
 #ifndef CXX_VS_15_HEADER_PATH_DETECTOR_H
 #define CXX_VS_15_HEADER_PATH_DETECTOR_H
 
-#include "utility/path_detector/PathDetector.h"
-#include "utility/ApplicationArchitectureType.h"
+#include "PathDetector.h"
+#include "ApplicationArchitectureType.h"
 
 class CxxVs15HeaderPathDetector: public PathDetector
 {

src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp

@@ -1,11 +1,11 @@
-#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h"
+#include "utilityCxxHeaderDetection.h"
 
 #include <QSettings>
 #include <QSysInfo>
 
-#include "utility/file/FileSystem.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityString.h"
+#include "FileSystem.h"
+#include "utilityApp.h"
+#include "utilityString.h"
 
 namespace utility
 {

src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.h

@@ -4,8 +4,8 @@
 #include <string>
 #include <vector>
 
-#include "utility/file/FilePath.h"
-#include "utility/ApplicationArchitectureType.h"
+#include "FilePath.h"
+#include "ApplicationArchitectureType.h"
 
 namespace utility
 {

src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.cpp

@@ -1,4 +1,4 @@
-#include "utility/path_detector/java_runtime/JavaPathDetector.h"
+#include "JavaPathDetector.h"
 
 JavaPathDetector::JavaPathDetector(const std::string& name, const std::string& javaVersion)
 	: PathDetector(name)

src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.h

@@ -1,7 +1,7 @@
 #ifndef JAVA_PATH_DETECTOR_H
 #define JAVA_PATH_DETECTOR_H
 
-#include "utility/path_detector/PathDetector.h"
+#include "PathDetector.h"
 
 class JavaPathDetector: public PathDetector
 {

src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp

@@ -1,8 +1,8 @@
-#include "utility/path_detector/java_runtime/JavaPathDetectorLinux.h"
+#include "JavaPathDetectorLinux.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityString.h"
+#include "FilePath.h"
+#include "utilityApp.h"
+#include "utilityString.h"
 
 #ifdef __x86_64__
 	const wchar_t jvmLibPathRelativeToJavaExecutable[] = L"/../lib/amd64/server/libjvm.so";

src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.h

@@ -1,7 +1,7 @@
 #ifndef JAVA_PATH_DETECTOR_LINUX_H
 #define JAVA_PATH_DETECTOR_LINUX_H
 
-#include "utility/path_detector/java_runtime/JavaPathDetector.h"
+#include "JavaPathDetector.h"
 
 class JavaPathDetectorLinux
 	: public JavaPathDetector

src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp

@@ -1,8 +1,8 @@
-#include "utility/path_detector/java_runtime/JavaPathDetectorMac.h"
+#include "JavaPathDetectorMac.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityString.h"
+#include "FilePath.h"
+#include "utilityApp.h"
+#include "utilityString.h"
 
 JavaPathDetectorMac::JavaPathDetectorMac(const std::string javaVersion)
 	: JavaPathDetector("Java " + javaVersion + " for Mac", javaVersion)

src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.h

@@ -1,7 +1,7 @@
 #ifndef JAVA_PATH_DETECTOR_MAC_H
 #define JAVA_PATH_DETECTOR_MAC_H
 
-#include "utility/path_detector/java_runtime/JavaPathDetector.h"
+#include "JavaPathDetector.h"
 
 class JavaPathDetectorMac
 	: public JavaPathDetector

src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp

@@ -1,10 +1,10 @@
-#include "utility/path_detector/java_runtime/JavaPathDetectorWindows.h"
+#include "JavaPathDetectorWindows.h"
 
 #include <QSettings>
 #include <QSysInfo>
 
-#include "utility/file/FilePath.h"
-#include "utility/utility.h"
+#include "FilePath.h"
+#include "utility.h"
 
 JavaPathDetectorWindows::JavaPathDetectorWindows(const std::string javaVersion)
 	: JavaPathDetector("Java " + javaVersion + " for Windows", javaVersion)

src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.h

@@ -1,7 +1,7 @@
 #ifndef JAVA_PATH_DETECTOR_WINDOWS_H
 #define JAVA_PATH_DETECTOR_WINDOWS_H
 
-#include "utility/path_detector/java_runtime/JavaPathDetector.h"
+#include "JavaPathDetector.h"
 
 class JavaPathDetectorWindows: public JavaPathDetector
 {

src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp

@@ -1,10 +1,10 @@
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h"
+#include "JreSystemLibraryPathDetector.h"
 
-#include "utility/path_detector/java_runtime/JavaPathDetector.h"
+#include "JavaPathDetector.h"
 
-#include "settings/ApplicationSettings.h"
-#include "utility/file/FilePath.h"
-#include "utility/file/FileSystem.h"
+#include "ApplicationSettings.h"
+#include "FilePath.h"
+#include "FileSystem.h"
 
 JreSystemLibraryPathDetector::JreSystemLibraryPathDetector(std::shared_ptr<JavaPathDetector> javaPathDetector)
 	: PathDetector("JRE System Library")

src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "utility/path_detector/PathDetector.h"
+#include "PathDetector.h"
 
 class JavaPathDetector;
 

src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp

@@ -1,6 +1,6 @@
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h"
+#include "JreSystemLibraryPathDetectorLinux.h"
 
-#include "utility/path_detector/java_runtime/JavaPathDetectorLinux.h"
+#include "JavaPathDetectorLinux.h"
 
 JreSystemLibraryPathDetectorLinux::JreSystemLibraryPathDetectorLinux(const std::string javaVersion)
 	: JreSystemLibraryPathDetector(std::make_shared<JavaPathDetectorLinux>(javaVersion))

src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h

@@ -1,7 +1,7 @@
 #ifndef JRE_SYSTEM_LIBRARY_PATH_DETECTOR_LINUX_H
 #define JRE_SYSTEM_LIBRARY_PATH_DETECTOR_LINUX_H
 
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h"
+#include "JreSystemLibraryPathDetector.h"
 
 class JreSystemLibraryPathDetectorLinux: public JreSystemLibraryPathDetector
 {

src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp

@@ -1,6 +1,6 @@
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h"
+#include "JreSystemLibraryPathDetectorMac.h"
 
-#include "utility/path_detector/java_runtime/JavaPathDetectorMac.h"
+#include "JavaPathDetectorMac.h"
 
 JreSystemLibraryPathDetectorMac::JreSystemLibraryPathDetectorMac(const std::string javaVersion)
 	: JreSystemLibraryPathDetector(std::make_shared<JavaPathDetectorMac>(javaVersion))

src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h

@@ -1,7 +1,7 @@
 #ifndef JRE_SYSTEM_LIBRARY_PATH_DETECTOR_MAC_H
 #define JRE_SYSTEM_LIBRARY_PATH_DETECTOR_MAC_H
 
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h"
+#include "JreSystemLibraryPathDetector.h"
 
 class JreSystemLibraryPathDetectorMac: public JreSystemLibraryPathDetector
 {

src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp

@@ -1,6 +1,6 @@
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h"
+#include "JreSystemLibraryPathDetectorWindows.h"
 
-#include "utility/path_detector/java_runtime/JavaPathDetectorWindows.h"
+#include "JavaPathDetectorWindows.h"
 
 JreSystemLibraryPathDetectorWindows::JreSystemLibraryPathDetectorWindows(const std::string javaVersion)
 	: JreSystemLibraryPathDetector(std::make_shared<JavaPathDetectorWindows>(javaVersion))

src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h

@@ -1,7 +1,7 @@
 #ifndef JRE_SYSTEM_LIBRARY_PATH_DETECTOR_WINDOWS_H
 #define JRE_SYSTEM_LIBRARY_PATH_DETECTOR_WINDOWS_H
 
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h"
+#include "JreSystemLibraryPathDetector.h"
 
 class JreSystemLibraryPathDetectorWindows: public JreSystemLibraryPathDetector
 {

src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp

@@ -1,7 +1,7 @@
-#include "utility/path_detector/maven_executable/MavenPathDetectorUnix.h"
+#include "MavenPathDetectorUnix.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/utilityApp.h"
+#include "FilePath.h"
+#include "utilityApp.h"
 
 MavenPathDetectorUnix::MavenPathDetectorUnix()
 	: PathDetector("Maven for Unix")

src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.h

@@ -1,7 +1,7 @@
 #ifndef MAVEN_PATH_DETECTOR_UNIX_H
 #define MAVEN_PATH_DETECTOR_UNIX_H
 
-#include "utility/path_detector/PathDetector.h"
+#include "PathDetector.h"
 
 class MavenPathDetectorUnix: public PathDetector
 {

src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp

@@ -1,7 +1,7 @@
-#include "utility/path_detector/maven_executable/MavenPathDetectorWindows.h"
+#include "MavenPathDetectorWindows.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/utilityApp.h"
+#include "FilePath.h"
+#include "utilityApp.h"
 
 MavenPathDetectorWindows::MavenPathDetectorWindows()
 	: PathDetector("Maven for Windows")

src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.h

@@ -1,7 +1,7 @@
 #ifndef MAVEN_PATH_DETECTOR_WINDOWS_H
 #define MAVEN_PATH_DETECTOR_WINDOWS_H
 
-#include "utility/path_detector/PathDetector.h"
+#include "PathDetector.h"
 
 class MavenPathDetectorWindows: public PathDetector
 {

src/lib_gui/utility/utilityApp.cpp

@@ -1,4 +1,4 @@
-#include "utility/utilityApp.h"
+#include "utilityApp.h"
 
 #include <QProcess>
 #include <QSysInfo>
@@ -6,11 +6,11 @@
 #include <qprocessordetection.h>
 
 #include "License.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/logging/logging.h"
-#include "utility/AppPath.h"
-#include "utility/UserPaths.h"
-#include "utility/utilityString.h"
+#include "ApplicationSettings.h"
+#include "logging.h"
+#include "AppPath.h"
+#include "UserPaths.h"
+#include "utilityString.h"
 
 namespace utility
 {

src/lib_gui/utility/utilityApp.h

@@ -5,8 +5,8 @@
 #include <set>
 #include <string>
 
-#include "utility/OsType.h"
-#include "utility/file/FilePath.h"
+#include "OsType.h"
+#include "FilePath.h"
 
 class License;
 

src/lib_gui/utility/utilityPathDetection.cpp

@@ -1,24 +1,24 @@
-#include "utility/utilityPathDetection.h"
+#include "utilityPathDetection.h"
 
-#include "utility/logging/logging.h"
+#include "logging.h"
 
-#include "utility/path_detector/java_runtime/JavaPathDetectorLinux.h"
-#include "utility/path_detector/java_runtime/JavaPathDetectorMac.h"
-#include "utility/path_detector/java_runtime/JavaPathDetectorWindows.h"
+#include "JavaPathDetectorLinux.h"
+#include "JavaPathDetectorMac.h"
+#include "JavaPathDetectorWindows.h"
 
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h"
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h"
-#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h"
+#include "JreSystemLibraryPathDetectorLinux.h"
+#include "JreSystemLibraryPathDetectorMac.h"
+#include "JreSystemLibraryPathDetectorWindows.h"
 
-#include "utility/path_detector/maven_executable/MavenPathDetectorUnix.h"
-#include "utility/path_detector/maven_executable/MavenPathDetectorWindows.h"
+#include "MavenPathDetectorUnix.h"
+#include "MavenPathDetectorWindows.h"
 
-#include "utility/path_detector/cxx_header/CxxFrameworkPathDetector.h"
-#include "utility/path_detector/cxx_header/CxxHeaderPathDetector.h"
-#include "utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h"
-#include "utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h"
+#include "CxxFrameworkPathDetector.h"
+#include "CxxHeaderPathDetector.h"
+#include "CxxVs10To14HeaderPathDetector.h"
+#include "CxxVs15HeaderPathDetector.h"
 
-#include "utility/utilityApp.h"
+#include "utilityApp.h"
 
 std::shared_ptr<CombinedPathDetector> utility::getJavaRuntimePathDetector()
 {

src/lib_gui/utility/utilityPathDetection.h

@@ -1,7 +1,7 @@
 #ifndef UTILITY_PATH_DETECTION_H
 #define UTILITY_PATH_DETECTION_H
 
-#include "utility/path_detector/CombinedPathDetector.h"
+#include "CombinedPathDetector.h"
 
 namespace utility
 {