https://github.com/Kitware/CMake
Revision 661622f011810093433afa5c9a4795b3d2f19070 authored by Brad King on 24 December 2014, 11:38:24 UTC, committed by CMake Topic Stage on 24 December 2014, 11:38:24 UTC
07fc7b75 Tests: Test using objects from a language enabled in a subdirectory (#15325)
fdbfcfdf Ninja: Generate rules only for languages compiled in a target (#15325)

2 parent s c20d3d3 + 07fc7b7
Raw File
Tip revision: 661622f011810093433afa5c9a4795b3d2f19070 authored by Brad King on 24 December 2014, 11:38:24 UTC
Merge topic 'ninja-fix-subdir-objlib-languages'
Tip revision: 661622f
CMakeMSYSFindMake.cmake

#=============================================================================
# Copyright 2005-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
#  License text for the above reference.)

find_program(CMAKE_MAKE_PROGRAM make
  PATHS
  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MSYS-1.0_is1;Inno Setup: App Path]/bin"
  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin"
  c:/msys/1.0/bin /msys/1.0/bin)
mark_as_advanced(CMAKE_MAKE_PROGRAM)
back to top