Commit 59432b7b authored by mark's avatar mark
Browse files

ENH: use pkgconfigAdjust when compiling software that has pkgconfig files

- simplifies relocation at a later stage
parent 82595ca8
......@@ -127,9 +127,11 @@ OPENMPI)
--enable-mpi-fortran=none \
--disable-mpi-profile \
$configOpt \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built: $mpiPACKAGE"
&& echo "Built: $mpiPACKAGE" \
&& pkgconfigAdjust $MPI_ARCH_PATH
) || {
echo "Error building: $mpiPACKAGE"
exit 1
......@@ -201,7 +203,6 @@ MPICH)
)
fi
;;
esac
......
......@@ -26,7 +26,7 @@
# makeCCMIO
#
# Description
# Build CD-adapco's ccmio library
# Build the libccmio library
#
# ----------------------------------------------
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
......@@ -64,8 +64,8 @@ options:
* Compile the proprietary libccmio library
$ccmioPACKAGE
Users wishing to make use of the library should contact cd-adapco
(Siemens PLM) for possible download and terms of use.
Users wishing to obtain the library should contact Siemens PLM (cd-adapco)
for terms of use.
After obtaining the $ccmioPACKAGE library, place in folder
......@@ -118,7 +118,6 @@ echo "---------------"
mkdir -p $libDIR 2>/dev/null
cpMakeFiles libccmio 2>/dev/null
set +x
if wmake $targetType
then
# make headers available:
......
......@@ -452,9 +452,9 @@ CMAKE_OPTIONS
${optHeadersOnly:+-DCGAL_HEADER_ONLY=TRUE} \
$configBoost $configGmp $configMpfr \
$CGAL_SOURCE_DIR \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install || exit 1
set +x
echo "----"
echo "create '\$CGAL_ARCH_PATH/share/files'"
......
......@@ -143,9 +143,11 @@ else
--libdir=$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
--enable-shared --disable-static \
--disable-fortran \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built $fftwPACKAGE"
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built $fftwPACKAGE" \
&& pkgconfigAdjust $FFTW_ARCH_PATH
) || {
echo "Error building: FFTW"
exit 1
......
......@@ -193,6 +193,7 @@ else
--prefix=$GMP_ARCH_PATH \
--libdir=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
--enable-cxx \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built: $gmpPACKAGE"
......@@ -249,6 +250,7 @@ else
--prefix=$MPFR_ARCH_PATH \
--libdir=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
$configGMP $configOpt \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built: $mpfrPACKAGE"
......@@ -301,6 +303,7 @@ else
--prefix=$MPC_ARCH_PATH \
--libdir=$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
$configGMP $configMPFR \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built: $mpcPACKAGE"
......@@ -366,6 +369,7 @@ else
--with-system-zlib \
$configGMP $configMPFR $configMPC $configOpt \
MAKEINFO=missing \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built: $gccPACKAGE"
......
......@@ -130,6 +130,7 @@ else
set -x
$GPERFTOOLS_SOURCE_DIR/configure \
--prefix=$GPERFTOOLS_ARCH_PATH \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built: $gperftoolsPACKAGE" \
......
......@@ -155,6 +155,7 @@ then
--with-gcc-toolchain=$(which gcc | sed s%/bin/gcc%%) \
--enable-optimized \
--enable-shared \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built: $llvmPACKAGE"
......@@ -183,6 +184,7 @@ else
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
$LLVM_SOURCE_DIR \
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built: $llvmPACKAGE"
......
......@@ -151,6 +151,8 @@ MESA_ARCH_PATH=$installBASE/$mesaPACKAGE
# - avoid GLES (GLES1) since <GLES/gl.h> may mask the <GL/gl.h> header
adjustMESA()
{
pkgconfigAdjust $MESA_ARCH_PATH
\rm -rf $MESA_ARCH_PATH/include/GLES $MESA_ARCH_PATH/include/GLES1
echo "removed all gles1 includes"
}
......@@ -202,10 +204,11 @@ adjustMESA()
--enable-texture-float \
--enable-gallium-osmesa --with-gallium-drivers=swrast \
$configOpt \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& adjustMESA \
&& echo "Built $mesaPACKAGE"
&& set +x \
&& make -j $WM_NCOMPPROCS \
&& make install \
&& echo "Built $mesaPACKAGE" \
&& adjustMESA
) || {
echo "Error building: MESA"
exit 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment