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

BUG: clean up lib and exe output paths

This commit is contained in:
Bill Hoffman 2001-09-06 18:02:26 -04:00
parent d204791e45
commit a14057c1b3
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/CMakeLists.txt
View File

@ -38,6 +38,7 @@ ADD_DEFINITIONS(-DCMAKE_BUILD_WITH_CMAKE)
IF (WIN32)
SOURCE_FILES(SRCS cmDSWWriter.cxx cmDSPWriter.cxx cmMSProjectGenerator.cxx)
SOURCE_FILES(SRCS cmBorlandMakefileGenerator.cpp)
IF(NOT UNIX)
SUBDIRS(MFCDialog)
ENDIF(NOT UNIX)

20
Source/cmBorlandMakefileGenerator.cpp
View File

@ -52,7 +52,15 @@ void cmBorlandMakefileGenerator::GenerateMakefile()
m_Makefile->AddLinkDirectory(m_ExecutableOutputPath.c_str());
}
}
if(m_ExecutableOutputPath.size() == 0)
{
m_ExecutableOutputPath = ".";
}
if(m_LibraryOutputPath.size() == 0)
{
m_LibraryOutputPath = ".";
}
if (m_CacheOnly)
{
// Generate the cache only stuff
@ -129,11 +137,13 @@ void cmBorlandMakefileGenerator::OutputMakefile(const char* file)
fout << m_Makefile->ExpandVariablesInString(replace);
replace = "BCB = $(BCBBINPATH)/.. \n";
fout << m_Makefile->ExpandVariablesInString(replace);
replace = "OUTDIRLIB = @LIBRARY_OUTPUT_PATH@ \n";
m_Makefile->ExpandVariablesInString(replace);
replace = "OUTDIRLIB = ";
replace += m_LibraryOutputPath;
replace += "\n";
fout << cmSystemTools::ConvertToWindowsSlashes(replace);
replace = "OUTDIREXE = @EXECUTABLE_OUTPUT_PATH@ \n";
m_Makefile->ExpandVariablesInString(replace);
replace = "OUTDIREXE = ";
replace += m_ExecutableOutputPath;
replace += "\n";
fout << cmSystemTools::ConvertToWindowsSlashes(replace);
replace = "USERDEFINES = @DEFS_USER@ \n";
fout << m_Makefile->ExpandVariablesInString(replace);