kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH:Changed CMAKE_SOURCE_ROOT to CMAKE_SOURCE_DIR

This commit is contained in:
Will Schroeder 2000-11-09 10:41:37 -05:00
parent 541dc47395
commit 65a28c7705
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -10,7 +10,7 @@ EXECUTABLES =
# make flags # make flags
# make flags can use these varibles: # make flags can use these varibles:
# ${CMAKE_BINARY_DIR} The root of the build tree where the binaries are # ${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 = INCLUDE_DIRECTORIES =
LINK_DIRECTORIES = LINK_DIRECTORIES =
LINK_LIBRARIES = # use the same name as ME = LINK_LIBRARIES = # use the same name as ME =

6
Source/cmCollectFlags.cxx
View File

@ -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. // include and library directories.
void cmCollectFlags::ExpandVaribles(cmMakefile* makefile) void cmCollectFlags::ExpandVaribles(cmMakefile* makefile)
@ -124,7 +124,7 @@ void cmCollectFlags::ExpandVaribles(cmMakefile* makefile)
{ {
cmSystemTools::ReplaceString(*j, "${CMAKE_BINARY_DIR}", cmSystemTools::ReplaceString(*j, "${CMAKE_BINARY_DIR}",
makefile->GetOutputHomeDirectory() ); makefile->GetOutputHomeDirectory() );
cmSystemTools::ReplaceString(*j, "${CMAKE_SOURCE_ROOT}", cmSystemTools::ReplaceString(*j, "${CMAKE_SOURCE_DIR}",
makefile->GetHomeDirectory() ); makefile->GetHomeDirectory() );
} }
begin = m_LinkDirectories.begin(); begin = m_LinkDirectories.begin();
@ -133,7 +133,7 @@ void cmCollectFlags::ExpandVaribles(cmMakefile* makefile)
{ {
cmSystemTools::ReplaceString(*j, "${CMAKE_BINARY_DIR}", cmSystemTools::ReplaceString(*j, "${CMAKE_BINARY_DIR}",
makefile->GetOutputHomeDirectory() ); makefile->GetOutputHomeDirectory() );
cmSystemTools::ReplaceString(*j, "${CMAKE_SOURCE_ROOT}", cmSystemTools::ReplaceString(*j, "${CMAKE_SOURCE_DIR}",
makefile->GetHomeDirectory() ); makefile->GetHomeDirectory() );
} }
} }

2
Source/cmCollectFlags.h
View File

@ -51,7 +51,7 @@ public:
/** /**
* Expance varibles for home and binary root in the collected flags. * 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->GetOutputHomeDirectory() and
* makefile->GetHomeDirectory() * makefile->GetHomeDirectory()
*/ */

6
Source/cmWindowsConfigure.cxx
View File

@ -34,15 +34,15 @@ bool cmWindowsConfigure::Configure(const char* file)
toFile += toFileName; toFile += toFileName;
cmSystemTools::ReplaceString(toFile, "${CMAKE_BINARY_DIR}", cmSystemTools::ReplaceString(toFile, "${CMAKE_BINARY_DIR}",
m_WhereBuild.c_str() ); m_WhereBuild.c_str() );
cmSystemTools::ReplaceString(toFile, "${CMAKE_SOURCE_ROOT}", cmSystemTools::ReplaceString(toFile, "${CMAKE_SOURCE_DIR}",
m_WhereSource.c_str() ); m_WhereSource.c_str() );
cmSystemTools::ReplaceString(fromFile, "${CMAKE_BINARY_DIR}", cmSystemTools::ReplaceString(fromFile, "${CMAKE_BINARY_DIR}",
m_WhereBuild.c_str() ); m_WhereBuild.c_str() );
cmSystemTools::ReplaceString(fromFile, "${CMAKE_SOURCE_ROOT}", cmSystemTools::ReplaceString(fromFile, "${CMAKE_SOURCE_DIR}",
m_WhereSource.c_str() ); m_WhereSource.c_str() );
cmSystemTools::ReplaceString(destDir, "${CMAKE_BINARY_DIR}", cmSystemTools::ReplaceString(destDir, "${CMAKE_BINARY_DIR}",
m_WhereBuild.c_str() ); m_WhereBuild.c_str() );
cmSystemTools::ReplaceString(destDir, "${CMAKE_SOURCE_ROOT}", cmSystemTools::ReplaceString(destDir, "${CMAKE_SOURCE_DIR}",
m_WhereSource.c_str() ); m_WhereSource.c_str() );
} }
} }