diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-12-20 22:00:52 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-12-20 22:00:52 (GMT) |
| commit | 5291b7d0259ad7fbd5a463d940aadf0ea78a4de0 (patch) | |
| tree | 3271f1523b8fea9aadcff2f3b07be763faf28322 /Source | |
| parent | 450b229c48b0674e3382dd21001544b78e0e8c43 (diff) | |
| download | CMake-5291b7d0259ad7fbd5a463d940aadf0ea78a4de0.zip CMake-5291b7d0259ad7fbd5a463d940aadf0ea78a4de0.tar.gz CMake-5291b7d0259ad7fbd5a463d940aadf0ea78a4de0.tar.bz2 | |
ENH: fix for win98 check for directory existence
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmBorlandMakefileGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmNMakeMakefileGenerator.cxx | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Source/cmBorlandMakefileGenerator.cxx b/Source/cmBorlandMakefileGenerator.cxx index d82ea61..ce70055 100644 --- a/Source/cmBorlandMakefileGenerator.cxx +++ b/Source/cmBorlandMakefileGenerator.cxx @@ -100,6 +100,11 @@ void cmBorlandMakefileGenerator::OutputMakeVariables(std::ostream& fout) "CMAKE_SHLIB_SUFFIX = @CMAKE_SHLIB_SUFFIX@\n" "CMAKE_LINKER_FLAGS = @CMAKE_LINKER_FLAGS@ @LINKER_BUILD_FLAGS@\n" "CMAKE_CXX_FLAGS = -P @CMAKE_CXX_FLAGS@ @BUILD_FLAGS@\n" + "!IF \"$(OS)\" == \"Windows_NT\"\n" + "NULL=\n" + "!ELSE \n" + "NULL=nul\n" + "!ENDIF \n" "RM = del\n"; std::string buildType = "CMAKE_CXX_FLAGS_"; buildType += m_Makefile->GetDefinition("CMAKE_BUILD_TYPE"); diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx index a61c494..5e56d2a 100644 --- a/Source/cmNMakeMakefileGenerator.cxx +++ b/Source/cmNMakeMakefileGenerator.cxx @@ -157,6 +157,11 @@ void cmNMakeMakefileGenerator::OutputMakeVariables(std::ostream& fout) "CMAKE_EXECUTABLE_SUFFIX = @CMAKE_EXECUTABLE_SUFFIX@\n" "CMAKE_STATICLIB_SUFFIX = @CMAKE_STATICLIB_SUFFIX@\n" "CMAKE_SHLIB_SUFFIX = @CMAKE_SHLIB_SUFFIX@\n" + "!IF \"$(OS)\" == \"Windows_NT\"\n" + "NULL=\n" + "!ELSE \n" + "NULL=nul\n" + "!ENDIF \n" "RM = del\n"; std::string buildType = "CMAKE_CXX_FLAGS_"; @@ -241,7 +246,7 @@ void cmNMakeMakefileGenerator::BuildInSubDirectory(std::ostream& fout, std::string dir = directory; cmSystemTools::ConvertToWindowsSlashes(dir); dir = cmSystemTools::EscapeSpaces(dir.c_str()); - fout << "\tif not exist " << dir + fout << "\tif not exist \"" << dir << "\\$(NULL)\"" << " " << "$(MAKE) $(MAKESILENT) rebuild_cache\n" << "\techo Building " << target1 << " in directory " << directory << "\n" |