OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #361 from rolk/361_cxxpath

Browse Source 
Test for executable and preserve erroneous path for messages
This commit is contained in:
Bård Skaflestad
2013-09-10 01:40:40 -07:00
parent bc13496fa2 7285bd8fdf
commit a1f2036b3e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/Scripts/configure vendored
View File

@@ -145,7 +145,7 @@ VARS=()
# command that launches cmake; look for 2.8 if available
if [ "${CMAKE_COMMAND}" = "" ]; then
if test -n "$(command -v cmake28)"; then
if [ -x "$(command -v cmake28)" ]; then
CMAKE_COMMAND=cmake28
else
CMAKE_COMMAND=cmake
@@ -453,11 +453,13 @@ for a in "${VARS[@]}"; do
;;
CC=*)
# special processing for compiler options
a=$(command -v ${a#CC=})
a=${a#CC=}
[ -x "$(command -v $a)" ] && a=$(command -v "$a")
c_compiler=" -DCMAKE_C_COMPILER=\"${a/\"/\\\"}\""
;;
CXX=*)
a=$(command -v ${a#CXX=})
a=${a#CXX=}
[ -x "$(command -v $a)" ] && a=$(command -v "$a")
cxx_compiler=" -DCMAKE_CXX_COMPILER=\"${a/\"/\\\"}\""
;;
CFLAGS=*)
@@ -469,7 +471,8 @@ for a in "${VARS[@]}"; do
cxx_opts=" -DCMAKE_CXX_FLAGS=\"${a/\"/\\\"}\""
;;
FC=*)
a=$(command -v ${a#FC=})
a=${a#FC=}
[ -x "$(command -v $a)" ] && a=$(command -v "$a")
fort_compiler=" -DCMAKE_Fortran_COMPILER=\"${a/\"/\\\"}\""
;;
FFLAGS=*)