diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-09-22 18:42:05 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-09-22 18:42:05 (GMT) |
| commit | 692ba48c4e5762b370f2999e902b8bd677c77161 (patch) | |
| tree | 0c9465d0e38a15bd0cb043f234b4e4ab0cee51a2 /Source/cmMakefile.cxx | |
| parent | 597185754420db18d83b2c9e3b9f1e33675bd935 (diff) | |
| download | CMake-692ba48c4e5762b370f2999e902b8bd677c77161.zip CMake-692ba48c4e5762b370f2999e902b8bd677c77161.tar.gz CMake-692ba48c4e5762b370f2999e902b8bd677c77161.tar.bz2 | |
ENH: major changes to support addition of languages from cmake modules directory.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index f4c862b..87ce942 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1028,23 +1028,22 @@ void cmMakefile::AddLibrary(const char* lname, int shared, switch (shared) { case 0: - target.SetType(cmTarget::STATIC_LIBRARY); + target.SetType(cmTarget::STATIC_LIBRARY, lname); break; case 1: - target.SetType(cmTarget::SHARED_LIBRARY); + target.SetType(cmTarget::SHARED_LIBRARY, lname); break; case 2: - target.SetType(cmTarget::MODULE_LIBRARY); + target.SetType(cmTarget::MODULE_LIBRARY, lname); break; default: - target.SetType(cmTarget::STATIC_LIBRARY); + target.SetType(cmTarget::STATIC_LIBRARY, lname); } // Clear its dependencies. Otherwise, dependencies might persist // over changes in CMakeLists.txt, making the information stale and // hence useless. target.ClearDependencyInformation( *this, lname ); - target.SetInAll(true); target.GetSourceLists() = srcs; this->AddGlobalLinkInformation(lname, target); @@ -1095,7 +1094,7 @@ cmTarget* cmMakefile::AddExecutable(const char *exeName, const std::vector<std::string> &srcs) { cmTarget target; - target.SetType(cmTarget::EXECUTABLE); + target.SetType(cmTarget::EXECUTABLE, exeName); target.SetInAll(true); target.GetSourceLists() = srcs; this->AddGlobalLinkInformation(exeName, target); @@ -1132,7 +1131,7 @@ void cmMakefile::AddUtilityCommand(const char* utilityName, const std::vector<std::string> &out) { cmTarget target; - target.SetType(cmTarget::UTILITY); + target.SetType(cmTarget::UTILITY, utilityName); target.SetInAll(all); if (out.size() > 1) { |