diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | Source/cmCollectFlags.cxx | 6 | ||||
| -rw-r--r-- | Source/cmCollectFlags.h | 2 | ||||
| -rw-r--r-- | Source/cmWindowsConfigure.cxx | 6 |
4 files changed, 8 insertions, 8 deletions
@@ -10,7 +10,7 @@ EXECUTABLES = # make flags # make flags can use these varibles: # ${CMAKE_BINARY_DIR} The root of the build tree where the binaries are -# ${CMAKE_SOURCE_ROOT} The root of the source tree where configure is +# ${CMAKE_SOURCE_DIR} The root of the source tree where configure is INCLUDE_DIRECTORIES = LINK_DIRECTORIES = LINK_LIBRARIES = # use the same name as ME = diff --git a/Source/cmCollectFlags.cxx b/Source/cmCollectFlags.cxx index 6e7e33c..855dd20 100644 --- a/Source/cmCollectFlags.cxx +++ b/Source/cmCollectFlags.cxx @@ -110,7 +110,7 @@ void cmCollectFlags::ParseDirectory(const char* dir) } -// expance CMAKE_BINARY_DIR and CMAKE_SOURCE_ROOT in the +// expance CMAKE_BINARY_DIR and CMAKE_SOURCE_DIR in the // include and library directories. void cmCollectFlags::ExpandVaribles(cmMakefile* makefile) @@ -124,7 +124,7 @@ void cmCollectFlags::ExpandVaribles(cmMakefile* makefile) { cmSystemTools::ReplaceString(*j, "${CMAKE_BINARY_DIR}", makefile->GetOutputHomeDirectory() ); - cmSystemTools::ReplaceString(*j, "${CMAKE_SOURCE_ROOT}", + cmSystemTools::ReplaceString(*j, "${CMAKE_SOURCE_DIR}", makefile->GetHomeDirectory() ); } begin = m_LinkDirectories.begin(); @@ -133,7 +133,7 @@ void cmCollectFlags::ExpandVaribles(cmMakefile* makefile) { cmSystemTools::ReplaceString(*j, "${CMAKE_BINARY_DIR}", makefile->GetOutputHomeDirectory() ); - cmSystemTools::ReplaceString(*j, "${CMAKE_SOURCE_ROOT}", + cmSystemTools::ReplaceString(*j, "${CMAKE_SOURCE_DIR}", makefile->GetHomeDirectory() ); } } diff --git a/Source/cmCollectFlags.h b/Source/cmCollectFlags.h index 28448b1..d37afb0 100644 --- a/Source/cmCollectFlags.h +++ b/Source/cmCollectFlags.h @@ -51,7 +51,7 @@ public: /** * Expance varibles for home and binary root in the collected flags. - * CMAKE_BINARY_DIR and CMAKE_SOURCE_ROOT are replaced with + * CMAKE_BINARY_DIR and CMAKE_SOURCE_DIR are replaced with * makefile->GetOutputHomeDirectory() and * makefile->GetHomeDirectory() */ diff --git a/Source/cmWindowsConfigure.cxx b/Source/cmWindowsConfigure.cxx index 0014265..db9275f 100644 --- a/Source/cmWindowsConfigure.cxx +++ b/Source/cmWindowsConfigure.cxx @@ -34,15 +34,15 @@ bool cmWindowsConfigure::Configure(const char* file) toFile += toFileName; cmSystemTools::ReplaceString(toFile, "${CMAKE_BINARY_DIR}", m_WhereBuild.c_str() ); - cmSystemTools::ReplaceString(toFile, "${CMAKE_SOURCE_ROOT}", + cmSystemTools::ReplaceString(toFile, "${CMAKE_SOURCE_DIR}", m_WhereSource.c_str() ); cmSystemTools::ReplaceString(fromFile, "${CMAKE_BINARY_DIR}", m_WhereBuild.c_str() ); - cmSystemTools::ReplaceString(fromFile, "${CMAKE_SOURCE_ROOT}", + cmSystemTools::ReplaceString(fromFile, "${CMAKE_SOURCE_DIR}", m_WhereSource.c_str() ); cmSystemTools::ReplaceString(destDir, "${CMAKE_BINARY_DIR}", m_WhereBuild.c_str() ); - cmSystemTools::ReplaceString(destDir, "${CMAKE_SOURCE_ROOT}", + cmSystemTools::ReplaceString(destDir, "${CMAKE_SOURCE_DIR}", m_WhereSource.c_str() ); } } |