diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-15 22:11:26 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-15 22:11:26 (GMT) |
| commit | 407afb906c6f3627d14acd959fb518d16caa5d7b (patch) | |
| tree | d54bf9fbdaceddb600e45c262aab4f8c8b400c20 /Templates | |
| parent | a6f5f8395ce28d50f28ce322f53c4390214ff956 (diff) | |
| download | CMake-407afb906c6f3627d14acd959fb518d16caa5d7b.zip CMake-407afb906c6f3627d14acd959fb518d16caa5d7b.tar.gz CMake-407afb906c6f3627d14acd959fb518d16caa5d7b.tar.bz2 | |
closer to nmake working, added CMAKE_MAKE_COMMAND instead of MAKECOMMAND used by Dart, nmake makefiles work with borland make and nmake
Diffstat (limited to 'Templates')
| -rw-r--r-- | Templates/CMakeNMakeWindowsSystemConfig.cmake | 2 | ||||
| -rw-r--r-- | Templates/CMakeSystemConfig.cmake.in | 1 | ||||
| -rw-r--r-- | Templates/CMakeWindowsBorlandConfig.cmake | 1 | ||||
| -rw-r--r-- | Templates/CMakeWindowsSystemConfig.cmake | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/Templates/CMakeNMakeWindowsSystemConfig.cmake b/Templates/CMakeNMakeWindowsSystemConfig.cmake index 9136109..0019f1e 100644 --- a/Templates/CMakeNMakeWindowsSystemConfig.cmake +++ b/Templates/CMakeNMakeWindowsSystemConfig.cmake @@ -24,6 +24,8 @@ SET (CMAKE_USE_WIN32_THREADS 1 CACHE BOOL "Use the win32 thread library") SET (CMAKE_STANDARD_WINDOWS_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" CACHE STRING "Libraries linked by defalut with all applications") SET (CMAKE_SHLIB_SUFFIX ".dll" CACHE STRING "Shared library suffix") SET (CMAKE_MODULE_SUFFIX ".dll" CACHE STRING "Module library suffix") +SET (CMAKE_MAKE_PROGRAM "nmake" CACHE STRING "Program used to build from makefiles.") + diff --git a/Templates/CMakeSystemConfig.cmake.in b/Templates/CMakeSystemConfig.cmake.in index 03c329a..f42ee0d 100644 --- a/Templates/CMakeSystemConfig.cmake.in +++ b/Templates/CMakeSystemConfig.cmake.in @@ -63,4 +63,5 @@ SET (CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@ CACHE INTERNAL "Is SET (CMAKE_ANSI_CFLAGS @CMAKE_ANSI_CFLAGS@ CACHE INTERNAL "What flags are required by the c++ compiler to make it ansi.") SET (CMAKE_ANSI_CXXFLAGS @CMAKE_ANSI_CXXFLAGS@ CACHE INTERNAL "What flags are required by the c++ compiler to make it ansi.") SET (CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION @CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION@ CACHE INTERNAL "does the compiler not support explicit template instantiation.") +FIND_PROGRAM(CMAKE_MAKE_PROGRAM NAMES gmake make ) diff --git a/Templates/CMakeWindowsBorlandConfig.cmake b/Templates/CMakeWindowsBorlandConfig.cmake index 1b2bf2b..86e8ca8d 100644 --- a/Templates/CMakeWindowsBorlandConfig.cmake +++ b/Templates/CMakeWindowsBorlandConfig.cmake @@ -94,3 +94,4 @@ IF (NOT DEFS_SYS) SET (DEFS_SYS "-DWIN32;WIN32_LEAN_AND_MEAN;STRICT;_RTLDLL;USEPACKAGES" CACHE STRING "Compiler conditional defines required for correct compilation") ENDIF (NOT DEFS_SYS) +FIND_PROGRAM(CMAKE_MAKE_PROGRAM make ${BCB_BIN_PATH} ) diff --git a/Templates/CMakeWindowsSystemConfig.cmake b/Templates/CMakeWindowsSystemConfig.cmake index 895a8b5..2e59adf 100644 --- a/Templates/CMakeWindowsSystemConfig.cmake +++ b/Templates/CMakeWindowsSystemConfig.cmake @@ -15,3 +15,4 @@ SET (CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Od /GZ" CACHE STRING SET (CMAKE_CXX_FLAGS "/W3 /Zm1000 /GX /GR" CACHE STRING "Flags used by the compiler during all build types, /GX /GR are for exceptions and rtti in VC++, /Zm1000 increases the compiler's memory allocation to support ANSI C++/stdlib") SET (CMAKE_USE_WIN32_THREADS 1 CACHE BOOL "Use the win32 thread library") +SET (CMAKE_MAKE_PROGRAM "msdev" CACHE STRING "Program used to build from dsp files.")
\ No newline at end of file |