Fix pugi?

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

src/build-scripts/build_openexr.bash

@@ -27,7 +27,7 @@ pwd
 echo "Building OpenEXR ${OPENEXR_VERSION}"
 echo "OpenEXR build dir will be: ${OPENEXR_BUILD_DIR}"
 echo "OpenEXR install dir will be: ${OPENEXR_INSTALL_DIR}"
-echo "OpenEXR Build type is ${OPENEXR_BUILD_TYPE}"
+echo "OpenEXR build type is ${OPENEXR_BUILD_TYPE}"
 echo "CMAKE_PREFIX_PATH is ${CMAKE_PREFIX_PATH}"
 
 # Clone OpenEXR project (including Imath) from GitHub and build
@@ -37,11 +37,11 @@ if [[ ! -e ${OPENEXR_SOURCE_DIR} ]] ; then
 fi
 mkdir -p ${OPENEXR_INSTALL_DIR} && true
 
-pushd ${OPENEXR_SOURCE_DIR}
+pushd ${LOCAL_DEPS_DIR}
 git checkout ${OPENEXR_VERSION} --force
 echo "Building OpenEXR from commit" `git rev-parse --short HEAD`
 
-cmake   -S . -B ${OPENEXR_BUILD_DIR} \
+cmake   -S ${OPENEXR_SOURCE_DIR} -B ${OPENEXR_BUILD_DIR} \
         -DCMAKE_BUILD_TYPE=${OPENEXR_BUILD_TYPE} \
         -DCMAKE_INSTALL_PREFIX="${OPENEXR_INSTALL_DIR}" \
         -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \

src/build-scripts/build_pugixml.bash

@@ -13,38 +13,40 @@ set -ex
 PUGIXML_REPO=${PUGIXML_REPO:=https://github.com/zeux/pugixml.git}
 PUGIXML_VERSION=${PUGIXML_VERSION:=v1.11.4}
 
-# Where to put pugixml repo source (default to the ext area)
-PUGIXML_SRC_DIR=${PUGIXML_SRC_DIR:=${PWD}/ext/pugixml}
-# Temp build area (default to a build/ subdir under source)
-PUGIXML_BUILD_DIR=${PUGIXML_BUILD_DIR:=${PUGIXML_SRC_DIR}/build}
-# Install area for pugixml (default to ext/dist)
 LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+PUGIXML_SOURCE_DIR=${PUGIXML_SOURCE_DIR:=${LOCAL_DEPS_DIR}/pugixml}
+PUGIXML_BUILD_DIR=${PUGIXML_BUILD_DIR:=${PUGIXML_SOURCE_DIR}/build}
 PUGIXML_INSTALL_DIR=${PUGIXML_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
-#PUGIXML_BUILD_OPTS=${PUGIXML_BUILD_OPTS:=}
+PUGIXML_BUILD_TYPE=${PUGIXML_BUILD_TYPE:=${CMAKE_BUILD_TYPE:-Release}}
 
 pwd
-echo "pugixml install dir will be: ${PUGIXML_INSTALL_DIR}"
+echo "Building Pugixml ${PUGIXML_VERSION}"
+echo "Pugixml build dir will be: ${PUGIXML_BUILD_DIR}"
+echo "Pugixml install dir will be: ${PUGIXML_INSTALL_DIR}"
+echo "Pugixml build type is ${PUGIXML_BUILD_TYPE}"
+echo "CMAKE_PREFIX_PATH is ${CMAKE_PREFIX_PATH}"
 
-mkdir -p ./ext
-pushd ./ext
+mkdir -p ${LOCAL_DEPS_DIR}
 
 # Clone pugixml project from GitHub and build
-if [[ ! -e ${PUGIXML_SRC_DIR} ]] ; then
-    echo "git clone ${PUGIXML_REPO} ${PUGIXML_SRC_DIR}"
-    git clone ${PUGIXML_REPO} ${PUGIXML_SRC_DIR}
+if [[ ! -e ${PUGIXML_SOURCE_DIR} ]] ; then
+    echo "git clone ${PUGIXML_REPO} ${PUGIXML_SOURCE_DIR}"
+    git clone ${PUGIXML_REPO} ${PUGIXML_SOURCE_DIR}
 fi
-cd ${PUGIXML_SRC_DIR}
+mkdir -p ${PUGIXML_INSTALL_DIR} && true
 
+pushd ${LOCAL_DEPS_DIR}
 echo "git checkout ${PUGIXML_VERSION} --force"
 git checkout ${PUGIXML_VERSION} --force
 echo "Building pugixml from commit" `git rev-parse --short HEAD`
 
 if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
-    time cmake -S . -B ${PUGIXML_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
+    time cmake -S ${PUGIXML_SOURCE_DIR} -B ${PUGIXML_BUILD_DIR} \
+               -DCMAKE_BUILD_TYPE=${PUGIXML_BUILD_TYPE} \
                -DCMAKE_INSTALL_PREFIX=${PUGIXML_INSTALL_DIR} \
-               -DBUILD_SHARED_LIBS=ON \
+               -DBUILD_SHARED_LIBS=${PUGIXML_LOCAL_BUILD_SHARED_LIBS:=ON} \
                -DBUILD_TESTS=OFF \
-               ${PUGIXML_BUILD_OPTS} ..
+               ${PUGIXML_CMAKE_FLAGS}
     time cmake --build ${PUGIXML_BUILD_DIR} --config Release --target install
 fi