summaryrefslogtreecommitdiffstats
path: root/Source/cmDSWMakefile.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2001-04-30 14:44:00 (GMT)
committerKen Martin <ken.martin@kitware.com>2001-04-30 14:44:00 (GMT)
commit2da0c57d46d5b68e19b60c4e6560fbd80f808ab0 (patch)
tree92bda106078e740b25b5d3922a89db1a6f6a996b /Source/cmDSWMakefile.cxx
parent13143f51d2f7096efc90624045f2b9ae26cc1fcd (diff)
downloadCMake-2da0c57d46d5b68e19b60c4e6560fbd80f808ab0.zip
CMake-2da0c57d46d5b68e19b60c4e6560fbd80f808ab0.tar.gz
CMake-2da0c57d46d5b68e19b60c4e6560fbd80f808ab0.tar.bz2
added TARGET_LINK_LIBRARY command and support for debug and release libraries to link against
Diffstat (limited to 'Source/cmDSWMakefile.cxx')
-rw-r--r--Source/cmDSWMakefile.cxx19
1 files changed, 13 insertions, 6 deletions
diff --git a/Source/cmDSWMakefile.cxx b/Source/cmDSWMakefile.cxx
index 2b50cf1..b03ece6 100644
--- a/Source/cmDSWMakefile.cxx
+++ b/Source/cmDSWMakefile.cxx
@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "cmSystemTools.h"
#include "cmDSPMakefile.h"
#include "cmMSProjectGenerator.h"
+#include "cmCacheManager.h"
cmDSWMakefile::cmDSWMakefile(cmMakefile* m)
@@ -151,9 +152,9 @@ void cmDSWMakefile::WriteProject(std::ostream& fout,
fout << "{{{\n";
// insert Begin Project Dependency Project_Dep_Name project stuff here
- cmMakefile::LinkLibraries::const_iterator j, jend;
- j = project->GetMakefile()->GetLinkLibraries().begin();
- jend = project->GetMakefile()->GetLinkLibraries().end();
+ cmTarget::LinkLibraries::const_iterator j, jend;
+ j = l.GetLinkLibraries().begin();
+ jend = l.GetLinkLibraries().end();
for(;j!= jend; ++j)
{
if(j->first != dspname)
@@ -161,9 +162,15 @@ void cmDSWMakefile::WriteProject(std::ostream& fout,
if (!l.IsALibrary() ||
project->GetLibraryBuildType() == cmDSPMakefile::DLL)
{
- fout << "Begin Project Dependency\n";
- fout << "Project_Dep_Name " << j->first << "\n";
- fout << "End Project Dependency\n";
+ // is the library part of this DSW ? If so add dependency
+ const char* cacheValue
+ = cmCacheManager::GetInstance()->GetCacheValue(j->first.c_str());
+ if(cacheValue)
+ {
+ fout << "Begin Project Dependency\n";
+ fout << "Project_Dep_Name " << j->first << "\n";
+ fout << "End Project Dependency\n";
+ }
}
}
}