ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Only add language package specific source and header files to build when enabled

Browse Source 
* removed preprocessor guards in language specific files to avoid "file has no symbols" warning
* separated files into multiple lists in lib and lib_gui CMakeLists.txt for each language package
This commit is contained in:
Eberhard Graether
2019-11-14 12:44:59 +01:00
parent 634e09ddfc
commit bb40bcfe45
81 changed files with 257 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/CMakeLists.txt
+64 -43
View File
@@ -344,39 +344,6 @@ add_files(
settings/migration/SettingsMigrationMoveKey.h
settings/migration/SettingsMigrator.h
settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp
settings/source_group/component/java/SourceGroupSettingsWithClasspath.h
settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp
settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h
settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp
settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h
settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp
settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h
settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h
settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h
settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.h
settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h
settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h
settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h
settings/source_group/component/python/SourceGroupSettingsWithPythonEnvironmentPath.cpp
settings/source_group/component/python/SourceGroupSettingsWithPythonEnvironmentPath.h
settings/source_group/component/python/SourceGroupSettingsWithSourceExtensionsPython.h
settings/source_group/component/SourceGroupSettingsWithCustomCommand.cpp
settings/source_group/component/SourceGroupSettingsWithCustomCommand.h
settings/source_group/component/SourceGroupSettingsWithExcludeFilters.cpp
@@ -387,16 +354,6 @@ add_files(
settings/source_group/component/SourceGroupSettingsWithSourcePaths.cpp
settings/source_group/component/SourceGroupSettingsWithSourcePaths.h
settings/source_group/type/SourceGroupSettingsCEmpty.h
settings/source_group/type/SourceGroupSettingsCppEmpty.h
settings/source_group/type/SourceGroupSettingsCustomCommand.h
settings/source_group/type/SourceGroupSettingsCxxCdb.h
settings/source_group/type/SourceGroupSettingsCxxCdbVs.h
settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h
settings/source_group/type/SourceGroupSettingsJavaEmpty.h
settings/source_group/type/SourceGroupSettingsJavaGradle.h
settings/source_group/type/SourceGroupSettingsJavaMaven.h
settings/source_group/type/SourceGroupSettingsPythonEmpty.h
settings/source_group/type/SourceGroupSettingsUnloadable.h
settings/source_group/SourceGroupSettings.cpp
@@ -661,3 +618,67 @@ if (WIN32)
utility/utilityWindows.h
)
endif()
if (BUILD_CXX_LANGUAGE_PACKAGE)
add_files(
LIB
settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h
settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h
settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.h
settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.cpp
settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h
settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h
settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h
settings/source_group/type/SourceGroupSettingsCEmpty.h
settings/source_group/type/SourceGroupSettingsCppEmpty.h
settings/source_group/type/SourceGroupSettingsCustomCommand.h
settings/source_group/type/SourceGroupSettingsCxxCdb.h
settings/source_group/type/SourceGroupSettingsCxxCdbVs.h
settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h
)
endif()
if (BUILD_JAVA_LANGUAGE_PACKAGE)
add_files(
LIB
settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp
settings/source_group/component/java/SourceGroupSettingsWithClasspath.h
settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp
settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h
settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp
settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h
settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp
settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h
settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h
settings/source_group/type/SourceGroupSettingsJavaEmpty.h
settings/source_group/type/SourceGroupSettingsJavaGradle.h
settings/source_group/type/SourceGroupSettingsJavaMaven.h
)
endif()
if (BUILD_PYTHON_LANGUAGE_PACKAGE)
add_files(
LIB
settings/source_group/component/python/SourceGroupSettingsWithPythonEnvironmentPath.cpp
settings/source_group/component/python/SourceGroupSettingsWithPythonEnvironmentPath.h
settings/source_group/component/python/SourceGroupSettingsWithSourceExtensionsPython.h
settings/source_group/type/SourceGroupSettingsPythonEmpty.h
)
endif()
src/lib/settings/ProjectSettings.cpp
+17 -8
View File
@@ -3,21 +3,30 @@
#include "SettingsMigrationDeleteKey.h"
#include "SettingsMigrationLambda.h"
#include "SettingsMigrationMoveKey.h"
#include "SourceGroupSettingsCEmpty.h"
#include "SourceGroupSettingsCppEmpty.h"
#include "SourceGroupSettingsCustomCommand.h"
#include "SourceGroupSettingsCxxCdb.h"
#include "SourceGroupSettingsCxxCodeblocks.h"
#include "SourceGroupSettingsJavaEmpty.h"
#include "SourceGroupSettingsJavaMaven.h"
#include "SourceGroupSettingsJavaGradle.h"
#include "SourceGroupSettingsPythonEmpty.h"
#include "SourceGroupSettingsUnloadable.h"
#include "logging.h"
#include "utilityFile.h"
#include "utilityString.h"
#include "utilityUuid.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupSettingsCEmpty.h"
#include "SourceGroupSettingsCppEmpty.h"
#include "SourceGroupSettingsCxxCdb.h"
#include "SourceGroupSettingsCxxCodeblocks.h"
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "SourceGroupSettingsJavaEmpty.h"
#include "SourceGroupSettingsJavaMaven.h"
#include "SourceGroupSettingsJavaGradle.h"
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#if BUILD_PYTHON_LANGUAGE_PACKAGE
#include "SourceGroupSettingsPythonEmpty.h"
#endif // BUILD_PYTHON_LANGUAGE_PACKAGE
const std::wstring ProjectSettings::PROJECT_FILE_EXTENSION = L".srctrlprj";
const std::wstring ProjectSettings::BOOKMARK_DB_FILE_EXTENSION = L".srctrlbm";
const std::wstring ProjectSettings::INDEX_DB_FILE_EXTENSION = L".srctrldb";
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithCStandard.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
std::wstring SourceGroupSettingsWithCStandard::getDefaultCStandardStatic()
@@ -69,5 +67,3 @@ std::wstring SourceGroupSettingsWithCStandard::getDefaultCStandard() const
{
return getDefaultCStandardStatic();
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_C_STANDARD_H
#define SOURCE_GROUP_SETTINGS_WITH_C_STANDARD_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <vector>
#include "SourceGroupSettingsComponent.h"
@@ -34,6 +30,4 @@ private:
std::wstring m_cStandard;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_C_STANDARD_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithCppStandard.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
std::wstring SourceGroupSettingsWithCppStandard::getDefaultCppStandardStatic()
@@ -69,5 +67,3 @@ std::wstring SourceGroupSettingsWithCppStandard::getDefaultCppStandard() const
{
return getDefaultCppStandardStatic();
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_CPP_STANDARD_H
#define SOURCE_GROUP_SETTINGS_WITH_CPP_STANDARD_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <vector>
#include "SourceGroupSettingsComponent.h"
@@ -34,6 +30,4 @@ private:
std::wstring m_cppStandard;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_CPP_STANDARD_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithCxxCdbPath.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
#include "utilityFile.h"
@@ -41,5 +39,3 @@ void SourceGroupSettingsWithCxxCdbPath::save(ConfigManager* config, const std::s
{
config->setValue(key + "/build_file_path/compilation_db_path", getCompilationDatabasePath().wstr());
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_CDB_PATH_H
#define SOURCE_GROUP_SETTINGS_WITH_CXX_CDB_PATH_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "FilePath.h"
#include "SourceGroupSettingsComponent.h"
@@ -28,6 +24,4 @@ private:
FilePath m_compilationDatabasePath;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_CXX_CDB_PATH_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithCxxCodeblocksPath.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
#include "utilityFile.h"
@@ -40,5 +38,3 @@ void SourceGroupSettingsWithCxxCodeblocksPath::save(ConfigManager* config, const
{
config->setValue(key + "/codeblocks_project_path", getCodeblocksProjectPath().wstr());
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_CODEBLOCKS_PATH_H
#define SOURCE_GROUP_SETTINGS_WITH_CXX_CODEBLOCKS_PATH_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "FilePath.h"
#include "SourceGroupSettingsComponent.h"
@@ -28,6 +24,4 @@ private:
FilePath m_codeblocksProjectPath;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_CXX_CODEBLOCKS_PATH_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
std::vector<std::wstring> SourceGroupSettingsWithCxxCrossCompilationOptions::getAvailableArchTypes()
@@ -233,5 +231,3 @@ void SourceGroupSettingsWithCxxCrossCompilationOptions::save(ConfigManager* conf
config->setValue(key + "/cross_compilation/target/sys", getTargetSys());
config->setValue(key + "/cross_compilation/target/abi", getTargetAbi());
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_CROSS_COMPILATION_OPTIONS_H
#define SOURCE_GROUP_SETTINGS_WITH_CXX_CROSS_COMPILATION_OPTIONS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <vector>
#include "SourceGroupSettingsComponent.h"
@@ -51,6 +47,4 @@ private:
std::wstring m_targetAbi;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_CXX_CROSS_COMPILATION_OPTIONS_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithCxxPathsAndFlags.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
#include "utility.h"
@@ -71,5 +69,3 @@ void SourceGroupSettingsWithCxxPathsAndFlags::save(ConfigManager* config, const
config->setValues(key + "/framework_search_paths/framework_search_path", getFrameworkSearchPaths());
config->setValues(key + "/compiler_flags/compiler_flag", getCompilerFlags());
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_PATHS_AND_FLAGS_H
#define SOURCE_GROUP_SETTINGS_WITH_CXX_PATHS_AND_FLAGS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <vector>
#include "FilePath.h"
@@ -39,6 +35,4 @@ private:
std::vector<std::wstring> m_compilerFlags;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_CXX_PATHS_AND_FLAGS_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithCxxPchOptions.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
#include "utility.h"
#include "utilityFile.h"
@@ -72,5 +70,3 @@ void SourceGroupSettingsWithCxxPchOptions::setPchFlags(const std::vector<std::ws
{
m_pchFlags = pchFlags;
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_PCH_OPTIONS_H
#define SOURCE_GROUP_SETTINGS_WITH_CXX_PCH_OPTIONS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "FilePath.h"
#include "SourceGroupSettingsComponent.h"
@@ -38,6 +34,4 @@ private:
bool m_useCompilerFlags = true;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_CXX_PCH_OPTIONS_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithIndexedHeaderPaths.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
#include "utility.h"
@@ -40,5 +38,3 @@ void SourceGroupSettingsWithIndexedHeaderPaths::save(ConfigManager* config, cons
{
config->setValues(key + "/indexed_header_paths/indexed_header_path", getIndexedHeaderPaths());
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_INDEXED_HEADER_PATHS_H
#define SOURCE_GROUP_SETTINGS_WITH_INDEXED_HEADER_PATHS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <vector>
#include "SourceGroupSettingsComponent.h"
@@ -31,6 +27,4 @@ private:
std::vector<FilePath> m_indexedHeaderPaths;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_INDEXED_HEADER_PATHS_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_C_H
#define SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_C_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithSourceExtensions.h"
class SourceGroupSettingsWithSourceExtensionsC
@@ -17,6 +13,4 @@ private:
}
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_C_H
src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_CPP_H
#define SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_CPP_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithSourceExtensions.h"
class SourceGroupSettingsWithSourceExtensionsCpp
@@ -21,6 +17,4 @@ private:
}
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_CPP_H
src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithClasspath.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
#include "utility.h"
@@ -52,5 +50,3 @@ void SourceGroupSettingsWithClasspath::save(ConfigManager* config, const std::st
config->setValues(key + "/class_paths/class_path", getClasspath());
config->setValue(key + "/use_jre_system_library", getUseJreSystemLibrary());
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_CLASSPATH_H
#define SOURCE_GROUP_SETTINGS_WITH_CLASSPATH_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include <vector>
#include "FilePath.h"
@@ -34,6 +30,4 @@ private:
bool m_useJreSystemLibrary = true;
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_CLASSPATH_H
src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithJavaGradle.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "ConfigManager.h"
#include "ProjectSettings.h"
#include "utilityFile.h"
@@ -58,5 +56,3 @@ void SourceGroupSettingsWithJavaGradle::save(ConfigManager* config, const std::s
config->setValue(key + "/gradle/project_file_path", getGradleProjectFilePath().wstr());
config->setValue(key + "/gradle/should_index_tests", getShouldIndexGradleTests());
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_JAVA_GRADLE_H
#define SOURCE_GROUP_SETTINGS_WITH_JAVA_GRADLE_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "FilePath.h"
#include "SourceGroupSettingsComponent.h"
@@ -34,6 +30,4 @@ private:
bool m_shouldIndexGradleTests = false;
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_JAVA_GRADLE_H
src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithJavaMaven.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "ConfigManager.h"
#include "ProjectSettings.h"
#include "utilityFile.h"
@@ -58,5 +56,3 @@ void SourceGroupSettingsWithJavaMaven::save(ConfigManager* config, const std::st
config->setValue(key + "/maven/project_file_path", getMavenProjectFilePath().wstr());
config->setValue(key + "/maven/should_index_tests", getShouldIndexMavenTests());
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_JAVA_MAVEN_H
#define SOURCE_GROUP_SETTINGS_WITH_JAVA_MAVEN_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "FilePath.h"
#include "SourceGroupSettingsComponent.h"
@@ -34,6 +30,4 @@ private:
bool m_shouldIndexMavenTests = false;
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_JAVA_MAVEN_H
src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "SourceGroupSettingsWithJavaStandard.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "ProjectSettings.h"
std::wstring SourceGroupSettingsWithJavaStandard::getDefaultJavaStandardStatic()
@@ -52,5 +50,3 @@ std::wstring SourceGroupSettingsWithJavaStandard::getDefaultJavaStandard() const
{
return getDefaultJavaStandardStatic();
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_JAVA_STANDARD_H
#define SOURCE_GROUP_SETTINGS_WITH_JAVA_STANDARD_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include <vector>
#include "SourceGroupSettingsComponent.h"
@@ -34,6 +30,4 @@ private:
std::wstring m_javaStandard;
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_JAVA_STANDARD_H
src/lib/settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_JAVA_H
#define SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_JAVA_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithSourceExtensions.h"
class SourceGroupSettingsWithSourceExtensionsJava
@@ -17,6 +13,4 @@ private:
}
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_JAVA_H
src/lib/settings/source_group/type/SourceGroupSettingsCEmpty.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_C_EMPTY_H
#define SOURCE_GROUP_SETTINGS_C_EMPTY_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithComponents.h"
#include "SourceGroupSettingsWithCStandard.h"
#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h"
@@ -36,6 +32,4 @@ public:
}
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_C_EMPTY_H
src/lib/settings/source_group/type/SourceGroupSettingsCxxCdb.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_CXX_CDB_H
#define SOURCE_GROUP_SETTINGS_CXX_CDB_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithComponents.h"
#include "SourceGroupSettingsWithCxxCdbPath.h"
#include "SourceGroupSettingsWithCxxPathsAndFlags.h"
@@ -32,6 +28,4 @@ public:
}
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_CXX_CDB_H
src/lib/settings/source_group/type/SourceGroupSettingsCxxCdbVs.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H
#define SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupSettingsCxxCdb.h"
class SourceGroupSettingsCxxCdbVs
@@ -13,6 +9,4 @@ class SourceGroupSettingsCxxCdbVs
using SourceGroupSettingsCxxCdb::SourceGroupSettingsCxxCdb;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H
src/lib/settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H
#define SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithComponents.h"
#include "SourceGroupSettingsWithCppStandard.h"
#include "SourceGroupSettingsWithCStandard.h"
@@ -36,6 +32,4 @@ public:
}
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H
src/lib/settings/source_group/type/SourceGroupSettingsJavaEmpty.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H
#define SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithComponents.h"
#include "SourceGroupSettingsWithClasspath.h"
#include "SourceGroupSettingsWithExcludeFilters.h"
@@ -32,6 +28,4 @@ public:
}
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H
src/lib/settings/source_group/type/SourceGroupSettingsJavaGradle.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H
#define SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithComponents.h"
#include "SourceGroupSettingsWithExcludeFilters.h"
#include "SourceGroupSettingsWithJavaGradle.h"
@@ -30,6 +26,4 @@ public:
}
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H
src/lib/settings/source_group/type/SourceGroupSettingsJavaMaven.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H
#define SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithComponents.h"
#include "SourceGroupSettingsWithExcludeFilters.h"
#include "SourceGroupSettingsWithJavaMaven.h"
@@ -30,6 +26,4 @@ public:
}
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H
src/lib/settings/source_group/type/SourceGroupSettingsPythonEmpty.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef SOURCE_GROUP_SETTINGS_PYTHON_EMPTY_H
#define SOURCE_GROUP_SETTINGS_PYTHON_EMPTY_H
#include "language_packages.h"
#if BUILD_PYTHON_LANGUAGE_PACKAGE
#include "SourceGroupSettingsWithComponents.h"
#include "SourceGroupSettingsWithExcludeFilters.h"
#include "SourceGroupSettingsWithPythonEnvironmentPath.h"
@@ -30,6 +26,4 @@ public:
}
};
#endif // BUILD_PYTHON_LANGUAGE_PACKAGE
#endif // SOURCE_GROUP_SETTINGS_PYTHON_EMPTY_H
src/lib_gui/CMakeLists.txt
+96 -72
View File
@@ -146,58 +146,22 @@ add_files(
qt/project_wizard/content/path/QtProjectWizardContentPath.cpp
qt/project_wizard/content/path/QtProjectWizardContentPath.h
qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h
qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h
qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h
qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h
qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h
qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h
qt/project_wizard/content/paths/QtProjectWizardContentPaths.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPaths.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsExclude.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsExclude.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.h
qt/project_wizard/content/QtProjectWizardContent.cpp
qt/project_wizard/content/QtProjectWizardContent.h
qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp
qt/project_wizard/content/QtProjectWizardContentCppStandard.h
qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp
qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h
qt/project_wizard/content/QtProjectWizardContentCStandard.cpp
qt/project_wizard/content/QtProjectWizardContentCStandard.h
qt/project_wizard/content/QtProjectWizardContentCustomCommand.cpp
qt/project_wizard/content/QtProjectWizardContentCustomCommand.h
qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp
qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h
qt/project_wizard/content/QtProjectWizardContentExtensions.cpp
qt/project_wizard/content/QtProjectWizardContentExtensions.h
qt/project_wizard/content/QtProjectWizardContentFlags.cpp
qt/project_wizard/content/QtProjectWizardContentFlags.h
qt/project_wizard/content/QtProjectWizardContentGroup.cpp
qt/project_wizard/content/QtProjectWizardContentGroup.h
qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp
qt/project_wizard/content/QtProjectWizardContentJavaStandard.h
qt/project_wizard/content/QtProjectWizardContentPreferences.cpp
qt/project_wizard/content/QtProjectWizardContentPreferences.h
qt/project_wizard/content/QtProjectWizardContentProjectData.cpp
@@ -210,8 +174,6 @@ add_files(
qt/project_wizard/content/QtProjectWizardContentSourceGroupInfoText.h
qt/project_wizard/content/QtProjectWizardContentUnloadable.cpp
qt/project_wizard/content/QtProjectWizardContentUnloadable.h
qt/project_wizard/content/QtProjectWizardContentVS.cpp
qt/project_wizard/content/QtProjectWizardContentVS.h
qt/project_wizard/QtProjectWizard.cpp
qt/project_wizard/QtProjectWizard.h
@@ -333,40 +295,6 @@ add_files(
qt/QtCoreApplication.cpp
qt/QtCoreApplication.h
utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp
utility/path_detector/cxx_header/CxxFrameworkPathDetector.h
utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp
utility/path_detector/cxx_header/CxxHeaderPathDetector.h
utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp
utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h
utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp
utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h
utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp
utility/path_detector/cxx_header/utilityCxxHeaderDetection.h
utility/path_detector/java_runtime/JavaPathDetector.cpp
utility/path_detector/java_runtime/JavaPathDetector.h
utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp
utility/path_detector/java_runtime/JavaPathDetectorLinux.h
utility/path_detector/java_runtime/JavaPathDetectorMac.cpp
utility/path_detector/java_runtime/JavaPathDetectorMac.h
utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
utility/path_detector/java_runtime/JavaPathDetectorWindows.h
utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp
utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h
utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp
utility/path_detector/maven_executable/MavenPathDetectorUnix.h
utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp
utility/path_detector/maven_executable/MavenPathDetectorWindows.h
utility/path_detector/CombinedPathDetector.cpp
utility/path_detector/CombinedPathDetector.h
utility/path_detector/PathDetector.cpp
@@ -378,3 +306,99 @@ add_files(
utility/utilityPathDetection.h
)
if (BUILD_CXX_LANGUAGE_PACKAGE)
add_files(
LIB_GUI
qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h
qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h
qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h
qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp
qt/project_wizard/content/QtProjectWizardContentCppStandard.h
qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp
qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h
qt/project_wizard/content/QtProjectWizardContentCStandard.cpp
qt/project_wizard/content/QtProjectWizardContentCStandard.h
qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp
qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h
qt/project_wizard/content/QtProjectWizardContentFlags.cpp
qt/project_wizard/content/QtProjectWizardContentFlags.h
qt/project_wizard/content/QtProjectWizardContentVS.cpp
qt/project_wizard/content/QtProjectWizardContentVS.h
utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp
utility/path_detector/cxx_header/CxxFrameworkPathDetector.h
utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp
utility/path_detector/cxx_header/CxxHeaderPathDetector.h
utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp
utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h
utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp
utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h
utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp
utility/path_detector/cxx_header/utilityCxxHeaderDetection.h
)
endif()
if (BUILD_JAVA_LANGUAGE_PACKAGE)
add_files(
LIB_GUI
qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h
qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h
qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp
qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h
qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp
qt/project_wizard/content/QtProjectWizardContentJavaStandard.h
utility/path_detector/java_runtime/JavaPathDetector.cpp
utility/path_detector/java_runtime/JavaPathDetector.h
utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp
utility/path_detector/java_runtime/JavaPathDetectorLinux.h
utility/path_detector/java_runtime/JavaPathDetectorMac.cpp
utility/path_detector/java_runtime/JavaPathDetectorMac.h
utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp
utility/path_detector/java_runtime/JavaPathDetectorWindows.h
utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp
utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp
utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h
utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp
utility/path_detector/maven_executable/MavenPathDetectorUnix.h
utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp
utility/path_detector/maven_executable/MavenPathDetectorWindows.h
)
endif()
if (BUILD_PYTHON_LANGUAGE_PACKAGE)
add_files(
LIB_GUI
qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp
qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h
)
endif()
src/lib_gui/qt/project_wizard/QtProjectWizard.cpp
+37 -28
View File
@@ -10,48 +10,20 @@
#include "language_packages.h"
#include "QtProjectWizardContent.h"
#include "QtProjectWizardContentCppStandard.h"
#include "QtProjectWizardContentCrossCompilationOptions.h"
#include "QtProjectWizardContentCStandard.h"
#include "QtProjectWizardContentCustomCommand.h"
#include "QtProjectWizardContentCxxPchFlags.h"
#include "QtProjectWizardContentExtensions.h"
#include "QtProjectWizardContentFlags.h"
#include "QtProjectWizardContentGroup.h"
#include "QtProjectWizardContentJavaStandard.h"
#include "QtProjectWizardContentPath.h"
#include "QtProjectWizardContentPathCDB.h"
#include "QtProjectWizardContentPathCodeblocksProject.h"
#include "QtProjectWizardContentPathCxxPch.h"
#include "QtProjectWizardContentPathPythonEnvironment.h"
#include "QtProjectWizardContentPathSourceGradle.h"
#include "QtProjectWizardContentPathSourceMaven.h"
#include "QtProjectWizardContentPaths.h"
#include "QtProjectWizardContentPathsClassJava.h"
#include "QtProjectWizardContentPathsExclude.h"
#include "QtProjectWizardContentPathsFrameworkSearch.h"
#include "QtProjectWizardContentPathsFrameworkSearchGlobal.h"
#include "QtProjectWizardContentPathsHeaderSearch.h"
#include "QtProjectWizardContentPathsHeaderSearchGlobal.h"
#include "QtProjectWizardContentPathsIndexedHeaders.h"
#include "QtProjectWizardContentPathsSource.h"
#include "QtProjectWizardContentProjectData.h"
#include "QtProjectWizardContentSelect.h"
#include "QtProjectWizardContentSourceGroupData.h"
#include "QtProjectWizardContentSourceGroupInfoText.h"
#include "QtProjectWizardContentUnloadable.h"
#include "QtProjectWizardContentVS.h"
#include "QtSourceGroupWizardPage.h"
#include "SourceGroupSettingsCEmpty.h"
#include "SourceGroupSettingsCppEmpty.h"
#include "SourceGroupSettingsCustomCommand.h"
#include "SourceGroupSettingsCxxCdb.h"
#include "SourceGroupSettingsCxxCdbVs.h"
#include "SourceGroupSettingsCxxCodeblocks.h"
#include "SourceGroupSettingsJavaEmpty.h"
#include "SourceGroupSettingsJavaGradle.h"
#include "SourceGroupSettingsJavaMaven.h"
#include "SourceGroupSettingsPythonEmpty.h"
#include "SourceGroupSettingsUnloadable.h"
#include "MessageLoadProject.h"
#include "MessageStatus.h"
@@ -64,6 +36,43 @@
#include "Application.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentCppStandard.h"
#include "QtProjectWizardContentCrossCompilationOptions.h"
#include "QtProjectWizardContentCStandard.h"
#include "QtProjectWizardContentCxxPchFlags.h"
#include "QtProjectWizardContentFlags.h"
#include "QtProjectWizardContentPathCDB.h"
#include "QtProjectWizardContentPathCodeblocksProject.h"
#include "QtProjectWizardContentPathCxxPch.h"
#include "QtProjectWizardContentPathsFrameworkSearch.h"
#include "QtProjectWizardContentPathsFrameworkSearchGlobal.h"
#include "QtProjectWizardContentPathsHeaderSearch.h"
#include "QtProjectWizardContentPathsHeaderSearchGlobal.h"
#include "QtProjectWizardContentPathsIndexedHeaders.h"
#include "QtProjectWizardContentVS.h"
#include "SourceGroupSettingsCEmpty.h"
#include "SourceGroupSettingsCppEmpty.h"
#include "SourceGroupSettingsCxxCdb.h"
#include "SourceGroupSettingsCxxCdbVs.h"
#include "SourceGroupSettingsCxxCodeblocks.h"
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "QtProjectWizardContentJavaStandard.h"
#include "QtProjectWizardContentPathSourceGradle.h"
#include "QtProjectWizardContentPathSourceMaven.h"
#include "QtProjectWizardContentPathsClassJava.h"
#include "SourceGroupSettingsJavaEmpty.h"
#include "SourceGroupSettingsJavaGradle.h"
#include "SourceGroupSettingsJavaMaven.h"
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#if BUILD_PYTHON_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPathPythonEnvironment.h"
#include "SourceGroupSettingsPythonEmpty.h"
#endif // BUILD_PYTHON_LANGUAGE_PACKAGE
namespace
{
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentCStandard.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <QComboBox>
#include <QLabel>
@@ -48,5 +46,3 @@ void QtProjectWizardContentCStandard::save()
m_sourceGroupSettings->setCStandard(m_standard->currentText().toStdWString());
}
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_C_STANDARD
#define QT_PROJECT_WIZARD_CONTENT_C_STANDARD
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContent.h"
class QComboBox;
@@ -32,6 +28,4 @@ private:
QComboBox* m_standard;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_C_STANDARD
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentCppStandard.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <QComboBox>
#include <QLabel>
@@ -48,5 +46,3 @@ void QtProjectWizardContentCppStandard::save()
m_sourceGroupSettings->setCppStandard(m_standard->currentText().toStdWString());
}
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_CPP_STANDARD
#define QT_PROJECT_WIZARD_CONTENT_CPP_STANDARD
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContent.h"
class QComboBox;
@@ -32,6 +28,4 @@ private:
QComboBox* m_standard;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_CPP_STANDARD
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentCrossCompilationOptions.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <QCheckBox>
#include <QComboBox>
#include <QLabel>
@@ -167,5 +165,3 @@ void QtProjectWizardContentCrossCompilationOptions::updateTargetOptionsEnabled()
m_sys->setEnabled(useTargetOptions);
m_abi->setEnabled(useTargetOptions);
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_CROSS_COMPILATION_OPTIONS
#define QT_PROJECT_WIZARD_CONTENT_CROSS_COMPILATION_OPTIONS
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContent.h"
class QCheckBox;
@@ -42,6 +38,4 @@ private:
QComboBox* m_abi;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_CROSS_COMPILATION_OPTIONS
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentCxxPchFlags.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <QCheckBox>
#include <QMessageBox>
@@ -85,5 +83,3 @@ bool QtProjectWizardContentCxxPchFlags::check()
return true;
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_CXX_PCH_FLAGS_H
#define QT_PROJECT_WIZARD_CONTENT_CXX_PCH_FLAGS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContent.h"
class QCheckBox;
@@ -38,6 +34,4 @@ private:
QtStringListBox* m_list;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_CXX_PCH_FLAGS_H
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentFlags.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <QFormLayout>
#include <QMessageBox>
@@ -71,5 +69,3 @@ bool QtProjectWizardContentFlags::check()
return true;
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_FLAGS_H
#define QT_PROJECT_WIZARD_CONTENT_FLAGS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContent.h"
class QtStringListBox;
@@ -36,6 +32,4 @@ private:
QtStringListBox* m_list;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_FLAGS_H
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentJavaStandard.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include <QComboBox>
#include <QLabel>
@@ -48,5 +46,3 @@ void QtProjectWizardContentJavaStandard::save()
m_sourceGroupSettings->setJavaStandard(m_standard->currentText().toStdWString());
}
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_JAVA_STANDARD
#define QT_PROJECT_WIZARD_CONTENT_JAVA_STANDARD
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "QtProjectWizardContent.h"
class QComboBox;
@@ -32,6 +28,4 @@ private:
QComboBox* m_standard;
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_JAVA_STANDARD
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentVS.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "MessageIDECreateCDB.h"
QtProjectWizardContentVS::QtProjectWizardContentVS(QtProjectWizardWindow* window)
@@ -46,5 +44,3 @@ void QtProjectWizardContentVS::handleVSCDBClicked()
{
MessageIDECreateCDB().dispatch();
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_VS_H
#define QT_PROJECT_WIZARD_CONTENT_VS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContent.h"
class QtProjectWizardContentVS
@@ -21,6 +17,4 @@ private slots:
void handleVSCDBClicked();
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_VS_H
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathCDB.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPathsIndexedHeaders.h"
#include "SourceGroupCxxCdb.h"
#include "SourceGroupSettingsCxxCdb.h"
@@ -135,5 +133,3 @@ std::shared_ptr<SourceGroupSettings> QtProjectWizardContentPathCDB::getSourceGro
{
return m_settings;
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATH_CDB_H
#define QT_PROJECT_WIZARD_CONTENT_PATH_CDB_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPath.h"
#include "SingleValueCache.h"
@@ -41,6 +37,4 @@ private:
mutable SingleValueCache<std::vector<FilePath>> m_filePaths;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATH_CDB_H
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathCodeblocksProject.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPathsIndexedHeaders.h"
#include "SourceGroupCxxCodeblocks.h"
#include "SourceGroupSettingsCxxCodeblocks.h"
@@ -115,5 +113,3 @@ std::shared_ptr<SourceGroupSettings> QtProjectWizardContentPathCodeblocksProject
{
return m_settings;
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATH_CODE_BLOCKS_PROJECT_H
#define QT_PROJECT_WIZARD_CONTENT_PATH_CODE_BLOCKS_PROJECT_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPath.h"
#include "SingleValueCache.h"
@@ -41,6 +37,4 @@ private:
mutable SingleValueCache<std::vector<FilePath>> m_filePaths;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATH_CODE_BLOCKS_PROJECT_H
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathCxxPch.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <QMessageBox>
#include "IndexerCommandCxx.h"
@@ -110,5 +108,3 @@ std::shared_ptr<SourceGroupSettings> QtProjectWizardContentPathCxxPch::getSource
{
return m_settings;
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATH_CXX_PCH_H
#define QT_PROJECT_WIZARD_CONTENT_PATH_CXX_PCH_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPath.h"
#include "SingleValueCache.h"
@@ -35,6 +31,4 @@ private:
std::shared_ptr<SourceGroupSettingsWithCxxPchOptions> m_settingsCxxPch;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATH_CXX_PCH_H
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathPythonEnvironment.h"
#if BUILD_PYTHON_LANGUAGE_PACKAGE
#include "ResourcePaths.h"
#include "SourceGroupSettingsPythonEmpty.h"
#include "utilityApp.h"
@@ -91,5 +89,3 @@ std::shared_ptr<SourceGroupSettings> QtProjectWizardContentPathPythonEnvironment
{
return m_settings;
}
#endif // BUILD_PYTHON_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATH_PYTHON_ENVIRONMENT_H
#define QT_PROJECT_WIZARD_CONTENT_PATH_PYTHON_ENVIRONMENT_H
#include "language_packages.h"
#if BUILD_PYTHON_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPath.h"
#include "QtThreadedFunctor.h"
@@ -31,6 +27,4 @@ private:
QLabel* m_resultLabel;
};
#endif // BUILD_PYTHON_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATH_PYTHON_ENVIRONMENT_H
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathSourceGradle.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include <QCheckBox>
#include "Application.h"
@@ -73,5 +71,3 @@ std::shared_ptr<SourceGroupSettings> QtProjectWizardContentPathSourceGradle::get
{
return m_settings;
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_GRADLE_H
#define QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_GRADLE_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPath.h"
class QCheckBox;
@@ -34,6 +30,4 @@ private:
QCheckBox* m_shouldIndexTests;
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_GRADLE_H
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathSourceMaven.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include <QCheckBox>
#include "Application.h"
@@ -103,5 +101,3 @@ std::shared_ptr<SourceGroupSettings> QtProjectWizardContentPathSourceMaven::getS
{
return m_settings;
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_MAVEN_H
#define QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_MAVEN_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPath.h"
class QCheckBox;
@@ -34,6 +30,4 @@ private:
QCheckBox* m_shouldIndexTests;
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_MAVEN_H
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathsClassJava.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include <QCheckBox>
#include "SourceGroupSettings.h"
@@ -56,5 +54,3 @@ void QtProjectWizardContentPathsClassJava::save()
settings->setUseJreSystemLibrary(m_useJreSystemLibraryCheckBox->isChecked());
}
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_CLASS_JAVA_H
#define QT_PROJECT_WIZARD_CONTENT_PATHS_CLASS_JAVA_H
#include "language_packages.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPaths.h"
class QCheckBox;
@@ -25,6 +21,4 @@ private:
QCheckBox* m_useJreSystemLibraryCheckBox;
};
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATHS_CLASS_JAVA_H
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathsFrameworkSearch.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupSettings.h"
#include "SourceGroupSettingsWithCxxPathsAndFlags.h"
@@ -43,5 +41,3 @@ bool QtProjectWizardContentPathsFrameworkSearch::isScrollAble() const
{
return true;
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_H
#define QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPaths.h"
class QtProjectWizardContentPathsFrameworkSearch
@@ -22,6 +18,4 @@ public:
virtual bool isScrollAble() const override;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_H
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathsFrameworkSearchGlobal.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "ApplicationSettings.h"
#include "utilityPathDetection.h"
@@ -34,5 +32,3 @@ void QtProjectWizardContentPathsFrameworkSearchGlobal::save()
ApplicationSettings::getInstance()->setFrameworkSearchPaths(m_list->getPathsAsDisplayed());
ApplicationSettings::getInstance()->save();
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_GLOBAL_H
#define QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_GLOBAL_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPaths.h"
class QtProjectWizardContentPathsFrameworkSearchGlobal
@@ -19,6 +15,4 @@ public:
virtual void save() override;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_GLOBAL_H
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathsHeaderSearch.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <cmath>
#include <QMessageBox>
@@ -399,5 +397,3 @@ void QtProjectWizardContentPathsHeaderSearch::showValidationResult(const std::ve
connect(m_filesDialog.get(), &QtTextEditDialog::canceled, this, &QtProjectWizardContentPathsHeaderSearch::closedFilesDialog);
}
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_H
#define QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "FilePathFilter.h"
#include "QtProjectWizardContentPaths.h"
@@ -43,6 +39,4 @@ private:
const bool m_indicateAsAdditional;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_H
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathsHeaderSearchGlobal.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <QMessageBox>
#include "ApplicationSettings.h"
@@ -112,5 +110,3 @@ void QtProjectWizardContentPathsHeaderSearchGlobal::setPaths(const std::vector<F
m_list->addPaths({ ResourcePaths::getCxxCompilerHeaderPath() }, true);
m_list->addPaths(paths);
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_GLOBAL_H
#define QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_GLOBAL_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPaths.h"
class QtProjectWizardContentPathsHeaderSearchGlobal
@@ -27,6 +23,4 @@ private:
void setPaths(const std::vector<FilePath>& paths);
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_GLOBAL_H
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp
-4
View File
@@ -1,7 +1,5 @@
#include "QtProjectWizardContentPathsIndexedHeaders.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include <QMessageBox>
#include "CodeblocksProject.h"
@@ -253,5 +251,3 @@ void QtProjectWizardContentPathsIndexedHeaders::savedFilesDialog()
m_list->setPaths(dynamic_cast<QtSelectPathsDialog*>(m_filesDialog.get())->getPathsList());
closedFilesDialog();
}
#endif // BUILD_CXX_LANGUAGE_PACKAGE
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h
-6
View File
@@ -1,10 +1,6 @@
#ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_INDEXED_HEADER_PATHS_H
#define QT_PROJECT_WIZARD_CONTENT_PATHS_INDEXED_HEADER_PATHS_H
#include "language_packages.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "QtProjectWizardContentPaths.h"
class SourceGroupSettingsCxxCdb;
@@ -38,6 +34,4 @@ private:
const std::string m_projectKindName;
};
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#endif // QT_PROJECT_WIZARD_CONTENT_PATHS_INDEXED_HEADER_PATHS_H
src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.cpp
+1 -1
View File
@@ -4,13 +4,13 @@
#include "SourceGroupCustomCommand.h"
#include "SourceGroupSettingsCustomCommand.h"
#include "SourceGroupSettingsWithCxxPathsAndFlags.h"
#include "SourceGroupSettingsWithSourcePaths.h"
#include "utility.h"
#include "utilityFile.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "SourceGroupCxxEmpty.h"
#include "SourceGroupSettingsWithCxxPathsAndFlags.h"
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#if BUILD_JAVA_LANGUAGE_PACKAGE
src/lib_gui/utility/utilityPathDetection.cpp
+27 -12
View File
@@ -1,29 +1,33 @@
#include "utilityPathDetection.h"
#include "language_packages.h"
#include "logging.h"
#include "utilityApp.h"
#include "JavaPathDetectorLinux.h"
#include "JavaPathDetectorMac.h"
#include "JavaPathDetectorWindows.h"
#include "JreSystemLibraryPathDetectorLinux.h"
#include "JreSystemLibraryPathDetectorMac.h"
#include "JreSystemLibraryPathDetectorWindows.h"
#include "MavenPathDetectorUnix.h"
#include "MavenPathDetectorWindows.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "CxxFrameworkPathDetector.h"
#include "CxxHeaderPathDetector.h"
#include "CxxVs10To14HeaderPathDetector.h"
#include "CxxVs15HeaderPathDetector.h"
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#include "utilityApp.h"
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "JavaPathDetectorLinux.h"
#include "JavaPathDetectorMac.h"
#include "JavaPathDetectorWindows.h"
#include "JreSystemLibraryPathDetectorLinux.h"
#include "JreSystemLibraryPathDetectorMac.h"
#include "JreSystemLibraryPathDetectorWindows.h"
#include "MavenPathDetectorUnix.h"
#include "MavenPathDetectorWindows.h"
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
std::shared_ptr<CombinedPathDetector> utility::getJavaRuntimePathDetector()
{
std::shared_ptr<CombinedPathDetector> combinedDetector = std::make_shared<CombinedPathDetector>();
#if BUILD_JAVA_LANGUAGE_PACKAGE
switch (utility::getOsType())
{
case OS_WINDOWS:
@@ -39,6 +43,7 @@ std::shared_ptr<CombinedPathDetector> utility::getJavaRuntimePathDetector()
LOG_WARNING("No suitable Java Runtime path detector found");
break;
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
return combinedDetector;
}
@@ -47,6 +52,7 @@ std::shared_ptr<CombinedPathDetector> utility::getJreSystemLibraryPathsDetector(
{
std::shared_ptr<CombinedPathDetector> combinedDetector = std::make_shared<CombinedPathDetector>();
#if BUILD_JAVA_LANGUAGE_PACKAGE
switch (utility::getOsType())
{
case OS_WINDOWS:
@@ -62,6 +68,7 @@ std::shared_ptr<CombinedPathDetector> utility::getJreSystemLibraryPathsDetector(
LOG_WARNING("No suitable JRE system library path detector found");
break;
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
return combinedDetector;
}
@@ -70,6 +77,7 @@ std::shared_ptr<CombinedPathDetector> utility::getMavenExecutablePathDetector()
{
std::shared_ptr<CombinedPathDetector> combinedDetector = std::make_shared<CombinedPathDetector>();
#if BUILD_JAVA_LANGUAGE_PACKAGE
switch (utility::getOsType())
{
case OS_WINDOWS:
@@ -83,6 +91,7 @@ std::shared_ptr<CombinedPathDetector> utility::getMavenExecutablePathDetector()
LOG_WARNING("No suitable Maven path detector found");
break;
}
#endif // BUILD_JAVA_LANGUAGE_PACKAGE
return combinedDetector;
}
@@ -96,6 +105,7 @@ std::shared_ptr<CombinedPathDetector> utility::getCxxVsHeaderPathDetector()
return combinedDetector;
}
#if BUILD_CXX_LANGUAGE_PACKAGE
combinedDetector->addDetector(std::make_shared<CxxVs15HeaderPathDetector>());
combinedDetector->addDetector(std::make_shared<CxxVs10To14HeaderPathDetector>(CxxVs10To14HeaderPathDetector::VISUAL_STUDIO_2015, false, APPLICATION_ARCHITECTURE_X86_32));
@@ -114,6 +124,7 @@ std::shared_ptr<CombinedPathDetector> utility::getCxxVsHeaderPathDetector()
combinedDetector->addDetector(std::make_shared<CxxVs10To14HeaderPathDetector>(CxxVs10To14HeaderPathDetector::VISUAL_STUDIO_2010, false, APPLICATION_ARCHITECTURE_X86_64));
combinedDetector->addDetector(std::make_shared<CxxVs10To14HeaderPathDetector>(CxxVs10To14HeaderPathDetector::VISUAL_STUDIO_2010, true, APPLICATION_ARCHITECTURE_X86_32));
combinedDetector->addDetector(std::make_shared<CxxVs10To14HeaderPathDetector>(CxxVs10To14HeaderPathDetector::VISUAL_STUDIO_2010, true, APPLICATION_ARCHITECTURE_X86_64));
#endif // BUILD_CXX_LANGUAGE_PACKAGE
return combinedDetector;
}
@@ -121,15 +132,19 @@ std::shared_ptr<CombinedPathDetector> utility::getCxxVsHeaderPathDetector()
std::shared_ptr<CombinedPathDetector> utility::getCxxHeaderPathDetector()
{
std::shared_ptr<CombinedPathDetector> combinedDetector = getCxxVsHeaderPathDetector();
#if BUILD_CXX_LANGUAGE_PACKAGE
combinedDetector->addDetector(std::make_shared<CxxHeaderPathDetector>("clang"));
combinedDetector->addDetector(std::make_shared<CxxHeaderPathDetector>("gcc"));
#endif // BUILD_CXX_LANGUAGE_PACKAGE
return combinedDetector;
}
std::shared_ptr<CombinedPathDetector> utility::getCxxFrameworkPathDetector()
{
std::shared_ptr<CombinedPathDetector> combinedDetector = std::make_shared<CombinedPathDetector>();
#if BUILD_CXX_LANGUAGE_PACKAGE
combinedDetector->addDetector(std::make_shared<CxxFrameworkPathDetector>("clang"));
combinedDetector->addDetector(std::make_shared<CxxFrameworkPathDetector>("gcc"));
#endif // BUILD_CXX_LANGUAGE_PACKAGE
return combinedDetector;
}
src/test/SettingsTestSuite.cpp
-3
View File
@@ -1,10 +1,7 @@
#include "catch.hpp"
#include "language_packages.h"
#include "ProjectSettings.h"
#include "Settings.h"
#include "SourceGroupSettingsWithCxxPathsAndFlags.h"
#include "SourceGroupSettings.h"
#include "SourceGroupSettingsWithSourcePaths.h"
src/test/SourceGroupTestSuite.cpp
+15 -14
View File
@@ -4,38 +4,39 @@
#include "language_packages.h"
#include "IndexerCommandCustom.h"
#include "SourceGroupCustomCommand.h"
#include "SourceGroupSettingsCEmpty.h"
#include "SourceGroupSettingsCppEmpty.h"
#include "SourceGroupSettingsCxxCdb.h"
#include "SourceGroupSettingsCxxCodeblocks.h"
#include "SourceGroupSettingsCustomCommand.h"
#include "SourceGroupSettingsJavaEmpty.h"
#include "SourceGroupSettingsJavaGradle.h"
#include "SourceGroupSettingsJavaMaven.h"
#include "ProjectSettings.h"
#include "Application.h"
#include "ApplicationSettings.h"
#include "FileSystem.h"
#include "TextAccess.h"
#include "AppPath.h"
#include "FileSystem.h"
#include "IndexerCommandCustom.h"
#include "ProjectSettings.h"
#include "SourceGroupCustomCommand.h"
#include "SourceGroupSettingsCustomCommand.h"
#include "TextAccess.h"
#include "utilityPathDetection.h"
#include "utilityString.h"
#include "Version.h"
#include "Application.h"
#if BUILD_CXX_LANGUAGE_PACKAGE
#include "IndexerCommandCxx.h"
#include "SourceGroupCxxEmpty.h"
#include "SourceGroupCxxCdb.h"
#include "SourceGroupCxxCodeblocks.h"
#include "SourceGroupSettingsCEmpty.h"
#include "SourceGroupSettingsCppEmpty.h"
#include "SourceGroupSettingsCxxCdb.h"
#include "SourceGroupSettingsCxxCodeblocks.h"
#endif // BUILD_CXX_LANGUAGE_PACKAGE
#if BUILD_JAVA_LANGUAGE_PACKAGE
#include "IndexerCommandJava.h"
#include "JavaEnvironmentFactory.h"
#include "SourceGroupJavaEmpty.h"
#include "SourceGroupJavaGradle.h"
#include "SourceGroupJavaMaven.h"
#include "SourceGroupSettingsJavaEmpty.h"
#include "SourceGroupSettingsJavaGradle.h"
#include "SourceGroupSettingsJavaMaven.h"
#include "utilityJava.h"
#endif // BUILD_JAVA_LANGUAGE_PACKAGE