Skip to content
Snippets Groups Projects
Commit 17f0aa1d authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: propogate WM_CC for CMake (fixes #226)

- reported by Bruno
parent 99efe5f8
Branches
Tags
No related merge requests found
...@@ -47,7 +47,8 @@ case "$ParaView_VERSION" in ...@@ -47,7 +47,8 @@ case "$ParaView_VERSION" in
if canBuildPlugin if canBuildPlugin
then then
( (
# C++ compiler for CMake # ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX" [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
wmake $targetType vtkPV3Readers wmake $targetType vtkPV3Readers
......
...@@ -47,7 +47,8 @@ case "$ParaView_VERSION" in ...@@ -47,7 +47,8 @@ case "$ParaView_VERSION" in
if canBuildPlugin if canBuildPlugin
then then
( (
# C++ compiler for CMake # ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX" [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
wmake $targetType vtkPVReaders wmake $targetType vtkPVReaders
......
...@@ -8,7 +8,8 @@ targetType=libso ...@@ -8,7 +8,8 @@ targetType=libso
# Source the wmake functions # Source the wmake functions
. $WM_DIR/scripts/wmakeFunctions . $WM_DIR/scripts/wmakeFunctions
# C++ compiler for CMake # ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX" [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
set -x set -x
......
...@@ -8,7 +8,8 @@ targetType=libso ...@@ -8,7 +8,8 @@ targetType=libso
# Source the wmake functions # Source the wmake functions
. $WM_DIR/scripts/wmakeFunctions . $WM_DIR/scripts/wmakeFunctions
# C++ compiler for CMake # ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX" [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
set -x set -x
......
...@@ -18,9 +18,9 @@ echo ...@@ -18,9 +18,9 @@ echo
if [ -d "$VTK_DIR" -o -d "$ParaView_DIR" ] if [ -d "$VTK_DIR" -o -d "$ParaView_DIR" ]
then then
# ensure CMake gets the correct C++ compiler # ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX" [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
[ -n "$WM_CC" ] && export CC="$WM_CC"
if type cmake > /dev/null 2>&1 if type cmake > /dev/null 2>&1
then then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment