[cmake-commits] alex committed cmLocalGenerator.cxx 1.235 1.236
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Aug 28 16:19:03 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv16385/Source
Modified Files:
cmLocalGenerator.cxx
Log Message:
ENH: add flag so a terminating slash for the link path can be specified (needed by the Digital Mars D compiler)
Alex
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- cmLocalGenerator.cxx 21 Aug 2007 20:22:55 -0000 1.235
+++ cmLocalGenerator.cxx 28 Aug 2007 20:19:01 -0000 1.236
@@ -1531,6 +1531,8 @@
}
std::string libPathFlag =
this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
+ std::string libPathTerminator =
+ this->Makefile->GetSafeDefinition("CMAKE_LIBRARY_PATH_TERMINATOR");
std::string libLinkFlag =
this->Makefile->GetSafeDefinition("CMAKE_LINK_LIBRARY_FLAG");
// collect all the flags needed for linking libraries
@@ -1599,6 +1601,7 @@
{
linkLibs += libPathFlag;
linkLibs += fullLibPath;
+ linkLibs += libPathTerminator;
linkLibs += " ";
// Put this directory in the rpath if using build-tree rpath
More information about the Cmake-commits
mailing list