Skip to content

Commit

Permalink
CMake: on Windows, make sure we search for patch.exe in PATH env var …
Browse files Browse the repository at this point in the history
…as well.
  • Loading branch information
franz committed Feb 3, 2015
1 parent 7d67673 commit 4539da2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,17 @@ message(STATUS "Hwloc_CFLAGS ${Hwloc_CFLAGS}")

find_program (PATCH_EXEC
NAMES patch patch.exe
HINTS ENV PATH
)

find_program (XARGS_EXEC
NAMES xargs xargs.exe
HINTS ENV PATH
)

find_program (CAT_EXEC
NAMES cat cat.exe
HINTS ENV PATH
)

if (!PATCH_EXEC)
Expand Down
2 changes: 1 addition & 1 deletion windows/setup_and_build_win64.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#/bin/bash

# This script requires following software preinstalled:
# * Git + git bash (default installer settings are fine)
# * Git + git bash (default installer settings are fine, make sure its in your PATH)
# * Python 2.7
# * Cmake 2.8 or later (make sure it will be added to PATH during installation)
# * Visual Studio Community edition 2013
Expand Down

0 comments on commit 4539da2

Please sign in to comment.