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

Merge pull request #356 from blattms/fix-compiler-path-from-variable

Browse Source 
Extracts the full compiler path and feeds it to cmake.
This commit is contained in:
Bård Skaflestad
2013-09-09 07:01:30 -07:00
parent 0652b09210 f35b177f3e
commit bc13496fa2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 which cmake28 >/dev/null 2>&1; then
if test -n "$(command -v cmake28)"; then
CMAKE_COMMAND=cmake28
else
CMAKE_COMMAND=cmake
@@ -453,11 +453,11 @@ for a in "${VARS[@]}"; do
;;
CC=*)
# special processing for compiler options
a=${a#CC=}
a=$(command -v ${a#CC=})
c_compiler=" -DCMAKE_C_COMPILER=\"${a/\"/\\\"}\""
;;
CXX=*)
a=${a#CXX=}
a=$(command -v ${a#CXX=})
cxx_compiler=" -DCMAKE_CXX_COMPILER=\"${a/\"/\\\"}\""
;;
CFLAGS=*)
@@ -469,7 +469,7 @@ for a in "${VARS[@]}"; do
cxx_opts=" -DCMAKE_CXX_FLAGS=\"${a/\"/\\\"}\""
;;
FC=*)
a=${a#FC=}
a=$(command -v ${a#FC=})
fort_compiler=" -DCMAKE_Fortran_COMPILER=\"${a/\"/\\\"}\""
;;
FFLAGS=*)