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