From 115c20364db345cfde6b4ab6879c85c6c890d232 Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Sat, 8 Oct 2022 08:17:56 -0600 Subject: [PATCH] Trying to fix geometry central install --- build_dependencies.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/build_dependencies.sh b/build_dependencies.sh index 1c66d95aaa..302eff1ba0 100755 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -1,7 +1,7 @@ #!/bin/bash #set -v #verbose execution for debugging -set -x #tracing execution for debugging (echos all commands from script) +#set -x #tracing execution for debugging (echos all commands from script) # defaults BUILD_CLEAN=0 @@ -292,15 +292,19 @@ build_geometry_central() if [[ $OSTYPE == "msys" ]]; then cmake -DCMAKE_CXX_FLAGS="-FS" -DCMAKE_C_FLAGS="-FS" -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" .. cmake --build . --config ${BUILD_TYPE} --parallel || exit 1 + # no make install, so we do this manually + cd .. + cp -a include/geometrycentral ${INSTALL_DIR}/include + cp build/src/Release/geometry-central.lib ${INSTALL_DIR}/lib else - cmake -DCMAKE_CXX_FLAGS="$FLAGS" -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. + cmake -DCMAKE_CXX_FLAGS="-fPIC $FLAGS" -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. make -j${NUM_PROCS} + # no make install, so we do this manually + cd .. + cp -a include/geometrycentral ${INSTALL_DIR}/include + cp build/src/*geom* ${INSTALL_DIR}/lib fi - # no make install, so we do this manually - cd .. - cp -a include/geometrycentral ${INSTALL_DIR}/include - cp build/src/*geom* ${INSTALL_DIR}/lib GEOMETRY_CENTRAL_DIR=${INSTALL_DIR}/geometry-central }