diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-12-22 21:42:36 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-12-22 21:42:36 (GMT) |
| commit | f6588b7919a0da4e0d5bb89b7f527e3fe2687bc3 (patch) | |
| tree | 4e64e8bb66e869ac393a25d758dda54d55838615 /Modules | |
| parent | 001bbb0d99aa8a02c5d211f5e55570ecc17e1fb0 (diff) | |
| download | CMake-f6588b7919a0da4e0d5bb89b7f527e3fe2687bc3.zip CMake-f6588b7919a0da4e0d5bb89b7f527e3fe2687bc3.tar.gz CMake-f6588b7919a0da4e0d5bb89b7f527e3fe2687bc3.tar.bz2 | |
ENH: fix borland make clean targets before build, add new generators for msys and mingw
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeMSYSFindMake.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeMinGWFindMake.cmake | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index 27e8b60..82b7c62 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -41,7 +41,7 @@ IF(NOT CMAKE_C_COMPILER) SET(CMAKE_C_COMPILER ${CMAKE_C_COMPILER_INIT} CACHE STRING "C compiler") ENDIF(NOT CMAKE_C_COMPILER) MARK_AS_ADVANCED(CMAKE_C_COMPILER) -FIND_PROGRAM(CMAKE_AR NAMES ar ) +FIND_PROGRAM(CMAKE_AR NAMES ar PATHS /mingw/bin c:/mingw/bin /msys/1.0/bin c:/msys/1.0/bin ) FIND_PROGRAM(CMAKE_RANLIB NAMES ranlib) IF(NOT CMAKE_RANLIB) diff --git a/Modules/CMakeMSYSFindMake.cmake b/Modules/CMakeMSYSFindMake.cmake new file mode 100644 index 0000000..83bd111 --- /dev/null +++ b/Modules/CMakeMSYSFindMake.cmake @@ -0,0 +1,2 @@ +FIND_PROGRAM(CMAKE_MAKE_PROGRAM make PATHS c:/msys/1.0/bin /msys/1.0/bin) +MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake new file mode 100644 index 0000000..1973d0f --- /dev/null +++ b/Modules/CMakeMinGWFindMake.cmake @@ -0,0 +1,2 @@ +FIND_PROGRAM(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS c:/MinGW/bin /MinGW/bin) +MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) |