diff options
| -rw-r--r-- | Source/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Source/cmBorlandMakefileGenerator2.cxx | 4 | ||||
| -rw-r--r-- | Source/cmakewizard.cxx | 3 | ||||
| -rw-r--r-- | Templates/CMakeWindowsBorlandConfig2.cmake | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 9e751ad..8a94d6c 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -41,10 +41,9 @@ IF (WIN32) SOURCE_FILES(SRCS cmBorlandMakefileGenerator.cpp) SOURCE_FILES(SRCS cmNMakeMakefileGenerator.cxx) IF(NOT UNIX) - IF( CMAKE_CXX_COMPILER MATCHES Borland ) - ELSE (CMAKE_CXX_COMPILER MATCHES Borland ) + IF( NOT BORLAND ) SUBDIRS(MFCDialog) - ENDIF( CMAKE_CXX_COMPILER MATCHES Borland) + ENDIF( NOT BORLAND ) ENDIF(NOT UNIX) ENDIF (WIN32) diff --git a/Source/cmBorlandMakefileGenerator2.cxx b/Source/cmBorlandMakefileGenerator2.cxx index 33609c8..0a04bf2 100644 --- a/Source/cmBorlandMakefileGenerator2.cxx +++ b/Source/cmBorlandMakefileGenerator2.cxx @@ -315,14 +315,14 @@ void cmBorlandMakefileGenerator2::OutputSharedLibraryRule(std::ostream& fout, command += "-e"; command += cmSystemTools::EscapeSpaces(dllpath.c_str()); command += " "; - // then list of object files - command += " $(" + std::string(name) + "_SRC_OBJS) "; std::strstream linklibs; this->OutputLinkLibraries(linklibs, name, t); linklibs << std::ends; // then the linker options -L and libraries (any other order will fail!) command += linklibs.str(); delete [] linklibs.str(); + // then list of object files + command += " $(" + std::string(name) + "_SRC_OBJS) "; std::string command2 = "implib -w "; command2 += libpath + " " + dllpath; const std::vector<cmSourceFile>& sources = t.GetSourceFiles(); diff --git a/Source/cmakewizard.cxx b/Source/cmakewizard.cxx index 6542c93..52cf726 100644 --- a/Source/cmakewizard.cxx +++ b/Source/cmakewizard.cxx @@ -37,7 +37,7 @@ void Ask(const char* key, cmCacheManager::CacheEntry & entry) } -main(int ac, char** av) +int main(int ac, char** av) { std::vector<std::string> args; for(int j=0; j < ac; ++j) @@ -105,4 +105,5 @@ main(int ac, char** av) } while(asked); std::cout << "CMake complete, run make to build project.\n"; + return 0; } diff --git a/Templates/CMakeWindowsBorlandConfig2.cmake b/Templates/CMakeWindowsBorlandConfig2.cmake index 82aad70..b67aad8 100644 --- a/Templates/CMakeWindowsBorlandConfig2.cmake +++ b/Templates/CMakeWindowsBorlandConfig2.cmake @@ -6,7 +6,7 @@ FIND_PATH(BCB_BIN_PATH bcc32.exe "/Borland/Bcc55/Bin" [HKEY_LOCAL_MACHINE/SOFTWARE/Borland/C++Builder/5.0/RootDir]/Bin ) - +SET (BORLAND 1) SET (WORDS_BIGENDIAN ) SET (HAVE_LIMITS_H 1) SET (HAVE_UNISTD_H 1) |