diff options
| author | Ken Martin <ken.martin@kitware.com> | 2002-12-17 17:56:04 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2002-12-17 17:56:04 (GMT) |
| commit | 18391be145e15a20e861b99fbeb98ab833354100 (patch) | |
| tree | 9c807614b973ecd42378905259062f9770b73445 | |
| parent | 2fb76a9f0704b1590f419a981c25784c1f0b932b (diff) | |
| download | CMake-18391be145e15a20e861b99fbeb98ab833354100.zip CMake-18391be145e15a20e861b99fbeb98ab833354100.tar.gz CMake-18391be145e15a20e861b99fbeb98ab833354100.tar.bz2 | |
better handling of Module
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 499118f..95698a3 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -85,6 +85,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile() this->SetBuildType(STATIC_LIBRARY, l->first.c_str()); break; case cmTarget::SHARED_LIBRARY: + case cmTarget::MODULE_LIBRARY: this->SetBuildType(DLL, l->first.c_str()); break; case cmTarget::EXECUTABLE: @@ -725,8 +726,10 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha // add libraries to executables and dlls (but never include // a library in a library, bad recursion) if ((target.GetType() != cmTarget::SHARED_LIBRARY - && target.GetType() != cmTarget::STATIC_LIBRARY) || - (target.GetType() == cmTarget::SHARED_LIBRARY && libName != j->first)) + && target.GetType() != cmTarget::STATIC_LIBRARY + && target.GetType() != cmTarget::MODULE_LIBRARY) || + (target.GetType()==cmTarget::SHARED_LIBRARY && libName != j->first) || + (target.GetType()==cmTarget::MODULE_LIBRARY && libName != j->first)) { std::string lib = j->first; if(j->first.find(".lib") == std::string::npos) |