diff options
author | Alex Neundorf <neundorf@kde.org> | 2012-07-28 16:00:19 (GMT) |
---|---|---|
committer | Alex Neundorf <neundorf@kde.org> | 2012-08-16 21:15:21 (GMT) |
commit | 5271ba56be87d5f412ea21c6c30cb72a893ceb25 (patch) | |
tree | bb6a7c67fc4ff2e06b4f206ec60ed77bbb77cafd /Source/cmExtraEclipseCDT4Generator.h | |
parent | c4306dc8057c45bc5edfd18465f85790800124cd (diff) | |
download | CMake-5271ba56be87d5f412ea21c6c30cb72a893ceb25.zip CMake-5271ba56be87d5f412ea21c6c30cb72a893ceb25.tar.gz CMake-5271ba56be87d5f412ea21c6c30cb72a893ceb25.tar.bz2 |
Eclipse: fix #13358: don't create bad linked resources
directory where the project file is located (${CMAKE_BINARY_DIR}), which can
happen e.g. for EXECUTABLE_OUTPUT_PATH and related variables.
Now, it seems this code never worked.
If EXECUTABLE_OUTPUT_PATH was set to point into a subdir of CMAKE_BINARY_DIR,
the code did nothing.
If it pointed directly at CMAKE_BINARY_DIR or some other location, it created
a linked resource. I tested this with Eclipse Europa (3.3) and Juno (4.2), and in this
case both versions of Eclipse complained that this is a bad location for a linked resource.
Alex
Diffstat (limited to 'Source/cmExtraEclipseCDT4Generator.h')
-rw-r--r-- | Source/cmExtraEclipseCDT4Generator.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h index ebd8c08..37ce65e 100644 --- a/Source/cmExtraEclipseCDT4Generator.h +++ b/Source/cmExtraEclipseCDT4Generator.h @@ -93,10 +93,6 @@ private: const std::string& path, LinkType linkType); - bool AppendOutLinkedResource(cmGeneratedFileStream& fout, - const std::string& defname, - const std::string& altdefname); - static void AppendIncludeDirectories(cmGeneratedFileStream& fout, const std::vector<std::string>& includeDirs, std::set<std::string>& emittedDirs); @@ -109,7 +105,6 @@ private: void CreateLinksForTargets(cmGeneratedFileStream& fout); std::vector<std::string> SrcLinkedResources; - std::vector<std::string> OutLinkedResources; std::string HomeDirectory; std::string HomeOutputDirectory; bool IsOutOfSourceBuild; |