diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Source/cmBorlandMakefileGenerator.cpp | 20 |
2 files changed, 16 insertions, 5 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index f38b693..bff926a 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -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) diff --git a/Source/cmBorlandMakefileGenerator.cpp b/Source/cmBorlandMakefileGenerator.cpp index 0448f24..3bdbb5b 100644 --- a/Source/cmBorlandMakefileGenerator.cpp +++ b/Source/cmBorlandMakefileGenerator.cpp @@ -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); |