diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-28 20:19:01 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-28 20:19:01 (GMT) |
| commit | c3b42e90ed4e4f98b1a055c9e62dc67aeb19e6f2 (patch) | |
| tree | d8c0a78266cd9dbfea66f65d89d97553a4dd193f | |
| parent | 172821eb3810645857b5e8d9dff13f59612334dc (diff) | |
| download | CMake-c3b42e90ed4e4f98b1a055c9e62dc67aeb19e6f2.zip CMake-c3b42e90ed4e4f98b1a055c9e62dc67aeb19e6f2.tar.gz CMake-c3b42e90ed4e4f98b1a055c9e62dc67aeb19e6f2.tar.bz2 | |
ENH: add flag so a terminating slash for the link path can be specified (needed by the Digital Mars D compiler)
Alex
| -rw-r--r-- | Modules/CMakeGenericSystem.cmake | 1 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index fb4332d..baecc52 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -6,6 +6,7 @@ SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "") # : or empty SET(CMAKE_INCLUDE_FLAG_C "-I") # -I SET(CMAKE_INCLUDE_FLAG_C_SEP "") # , or empty SET(CMAKE_LIBRARY_PATH_FLAG "-L") +SET(CMAKE_LIBRARY_PATH_TERMINATOR "") # for the Digital Mars D compiler the link paths have to be terminated with a "/" SET(CMAKE_LINK_LIBRARY_FLAG "-l") SET(CMAKE_LINK_LIBRARY_SUFFIX "") diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 87b34a1..7857072 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1531,6 +1531,8 @@ void cmLocalGenerator::OutputLinkLibraries(std::ostream& fout, } 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 @@ void cmLocalGenerator::OutputLinkLibraries(std::ostream& fout, { linkLibs += libPathFlag; linkLibs += fullLibPath; + linkLibs += libPathTerminator; linkLibs += " "; // Put this directory in the rpath if using build-tree rpath |