diff options
author | Fred Baksik <frodak17@gmail.com> | 2019-01-05 16:01:21 (GMT) |
---|---|---|
committer | Fred Baksik <frodak17@gmail.com> | 2019-01-16 15:41:24 (GMT) |
commit | 2ed2d6b46f9fb8f0742ce60bef16f1d636008136 (patch) | |
tree | d38c81c2e4b7bcbf38ddd2cb98eba8f050877a9e /Source/cmGhsMultiTargetGenerator.h | |
parent | ead7117afda23d7cf0c1466ce5229d06240d3de0 (diff) | |
download | CMake-2ed2d6b46f9fb8f0742ce60bef16f1d636008136.zip CMake-2ed2d6b46f9fb8f0742ce60bef16f1d636008136.tar.gz CMake-2ed2d6b46f9fb8f0742ce60bef16f1d636008136.tar.bz2 |
GHS: Place build system outputs per target output directives
-- Set output and object file locations
-- Suffixes are no longer being forced but will now follow the target properties
By default GHS tools have no suffix for executable files so
CMAKE_EXECUTABLE_SUFFIX was changed to meet this behavior
-- Remove #if 0 blocked out code; it has been replaced.
Forcing the -relprog option has been removed from non-kernel executable targets.
The default value of this option (if it is even available) is determined by the
tool-chain for the specified target and platform (Some tool-chains default to
-locatedprogram). The use of -relprog can have unexpected results as it cannot
always produce a fully relocated executable.
-- Clarify use of CMAKE_BUILD_TYPE to control build configuration
Diffstat (limited to 'Source/cmGhsMultiTargetGenerator.h')
-rw-r--r-- | Source/cmGhsMultiTargetGenerator.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h index 6ba110a..4523498 100644 --- a/Source/cmGhsMultiTargetGenerator.h +++ b/Source/cmGhsMultiTargetGenerator.h @@ -60,8 +60,8 @@ private: bool IsTargetGroup() const { return this->TargetGroup; } - void WriteTypeSpecifics(std::ostream& fout, const std::string& config, - bool notKernel); + void WriteTargetSpecifics(std::ostream& fout, const std::string& config, + bool notKernel); void WriteCompilerFlags(std::ostream& fout, const std::string& config, const std::string& language); void WriteCompilerDefinitions(std::ostream& fout, const std::string& config, @@ -87,7 +87,6 @@ private: cmGeneratorTarget* generatorTarget); static void WriteObjectLangOverride(std::ostream* fout, const cmSourceFile* sourceFile); - static void WriteObjectDir(std::ostream& fout, std::string const& dir); std::string GetOutputDirectory(const std::string& config) const; std::string GetOutputFilename(const std::string& config) const; static std::string ComputeLongestObjectDirectory( @@ -115,8 +114,10 @@ private: std::map<std::string, std::string> FlagsByLanguage; std::map<std::string, std::string> DefinesByLanguage; + std::string TargetNameReal; GhsMultiGpj::Types TagType; std::string const Name; + std::string ConfigName; /* CMAKE_BUILD_TYPE */ }; #endif // ! cmGhsMultiTargetGenerator_h |