From 040c19a840324648987494de6179d3ad98e7332b Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 21 Dec 2020 11:55:40 -0600 Subject: [PATCH 01/76] update cmake for mac build --- .gitignore | 1 + CMakeLists.txt | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e69de29bb..b97647c09 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +bld diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fd7d91f4..448c6be17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,10 @@ message(STATUS "CMAKE_INSTALL_RPATH: ${CMAKE_INSTALL_RPATH}") # based on which build options are enabled set(PLUGIN_SRC_FILES SvalinnPlugin.cpp) set(PLUGIN_LINK_LIBS ${CUBIT_LIBS}) - +SET(HDF5_USE_STATIC_LIBRARIES ON) +find_package(HDF5 REQUIRED) +include_directories(${HDF5_INCLUDE_DIRS}) +list(APPEND PLUGIN_LINK_LIBS ${HDF5_LIBRARIES}) # DAGMC exporter if (BUILD_DAGMC_EXPORTER) message(STATUS "Building DAGMC exporter") @@ -129,5 +132,5 @@ message(STATUS "Building Svalinn plugin") message(STATUS "PLUGIN_SRC_FILES: ${PLUGIN_SRC_FILES}") message(STATUS "PLUGIN_LINK_LIBS: ${PLUGIN_LINK_LIBS}") add_library(svalinn_plugin MODULE ${PLUGIN_SRC_FILES}) -target_link_libraries(svalinn_plugin ${PLUGIN_LINK_LIBS}) +target_link_libraries(svalinn_plugin PUBLIC ${PLUGIN_LINK_LIBS}) install(TARGETS svalinn_plugin LIBRARY DESTINATION lib) From edc9df4a2e608a9203d78c742915c5899df9e9ed Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 15:39:18 -0600 Subject: [PATCH 02/76] clean version of MACOS script --- script/build_plug_linux.sh | 4 ++ script/build_plugin.sh | 117 +++++++++++++++++++++++++++++++++ script/build_plugin_macos.sh | 122 +++++++++++++++++++++++++++++++++++ 3 files changed, 243 insertions(+) create mode 100755 script/build_plug_linux.sh create mode 100755 script/build_plugin.sh create mode 100755 script/build_plugin_macos.sh diff --git a/script/build_plug_linux.sh b/script/build_plug_linux.sh new file mode 100755 index 000000000..afd0dfd1d --- /dev/null +++ b/script/build_plug_linux.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +SCRIPTPATH=`dirname $(dirname $(realpath $0))` +docker run -v "$SCRIPTPATH:/Trelis-plugin" -v "$2:/Trelis-sdk" -it $1 bash -c "/Trelis-plugin/script/build_plugin.sh $3; bash" diff --git a/script/build_plugin.sh b/script/build_plugin.sh new file mode 100755 index 000000000..a422920e2 --- /dev/null +++ b/script/build_plugin.sh @@ -0,0 +1,117 @@ +#!/bin/bash + +cd /Trelis-sdk +dpkg -i Trelis-$1-Lin64.deb + +cd /opt +tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz +cd /opt/Trelis-16.5 +tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz + +TZ=America/Chicago +ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +apt-get update -y +apt-get install -y g++ autogen autoconf libtool libeigen3-dev libhdf5-dev patchelf gfortran git cmake + +cd + +# Setup +CURRENT=$(pwd) +SCRIPTPATH=`dirname $(dirname $(realpath $0))` + +PLUGIN_DIR="plugin-build" + +mkdir ${PLUGIN_DIR} +PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} + +echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" + +unset LD_LIBRARY_PATH + +cd ${PLUGIN_ABS_PATH} +ln -s $SCRIPTPATH/ ./ + +mkdir -pv moab/bld +cd moab +git clone https://bitbucket.org/fathomteam/moab -b Version5.1.0 +cd bld +cmake ../moab -DENABLE_HDF5=ON \ + -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_BLASLAPACK=OFF -DENABLE_FORTRAN=OFF -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/moab + +make -j`grep -c processor /proc/cpuinfo` +make install + +cd ${PLUGIN_ABS_PATH} +mkdir -pv DAGMC/bld +cd DAGMC +git clone https://github.com/bam241/DAGMC -b build_exe +cd bld +cmake ../DAGMC -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ + -DMOAB_DIR=${PLUGIN_ABS_PATH}/moab \ + -DBUILD_UWUW=ON \ + -DBUILD_TALLY=OFF \ + -DBUILD_BUILD_OBB=OFF \ + -DBUILD_MAKE_WATERTIGHT=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_STATIC_LIBS=ON \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/DAGMC +make -j`grep -c processor /proc/cpuinfo` +make install + + +cd ${PLUGIN_ABS_PATH}/Trelis-plugin +git submodule update --init + +cd ${PLUGIN_ABS_PATH} +mkdir -pv bld +cd bld +ls /opt/Trelis-${1::4} +ls /opt/Trelis-* +ls /opt +cmake ../Trelis-plugin -DCUBIT_ROOT=/opt/Trelis-${1::4} \ + -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH} +make -j`grep -c processor /proc/cpuinfo` +make install +echo " cmake ../Trelis-plugin -DCubit_DIR=/opt/Trelis-${1::4} \ + -DCUBIT_ROOT=/opt/Trelis-${1::4} \ + -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH} " + +cd ${PLUGIN_ABS_PATH} +mkdir -p pack/bin/plugins/svalinn +cd pack/bin/plugins/svalinn + +# Copy all needed libraries into current directory +cp -pPv ${PLUGIN_ABS_PATH}/lib/* . +cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.so* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.so* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.so* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.so . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.so . +cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.so.100* . +chmod 644 * + +# Set the RPATH to be the current directory for the DAGMC libraries +patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libMOAB.so +patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libdagmc.so +patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libmakeWatertight.so +patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libpyne_dagmc.so +patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libuwuw.so + +# Create the Svalinn plugin tarball +cd .. +ln -sv svalinn/libsvalinn_plugin.so . +cd ../.. +tar --sort=name -czvf svalinn-plugin_linux_$1.tgz bin +mv -v svalinn-plugin_linux_$1.tgz /Trelis-sdk +cd .. +#rm -rf pack bld DAGMC lib moab +#rm Trelis-plugin diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh new file mode 100755 index 000000000..048c3efe8 --- /dev/null +++ b/script/build_plugin_macos.sh @@ -0,0 +1,122 @@ +#!/bin/bash + +#Getting Macport +curl https://distfiles.macports.org/MacPorts/MacPorts-2.6.3-10.15-Catalina.pkg --output MacPorts-2.6.3-10.15-Catalina.pkg +sudo installer -pkg MacPorts-2.6.3-10.15-Catalina.pkg -target / + +export PATH=/opt/local/bin:/opt/local/sbin:$PATH +export MANPATH=/opt/local/share/man:$MANPATH +export LD_LIBRARY_PATH=/opt/local/lib:$LD_LIBRARY_PATH + + +sudo port selfupdate +sudo port install libtool eigen3 hdf5 cmake gcc6 wget realpath + +wget https://github.com/fxcoudert/gfortran-for-macOS/releases/download/10.2/gfortran-10.2-Catalina.dmg +hdiutil attach gfortran-10.2-Catalina.dmg +#sudo installer -pkg /Volumes/gfortran-10.2-Catalina/gfortran.pkg -target / +#hdiutil detach /Volumes/gfortran-10.2-Catalina + + + +cd + +# Setup +CURRENT=$(pwd) +SCRIPTPATH=`dirname $(dirname $(realpath $0))` + +PLUGIN_DIR="plugin-build" + +mkdir ${PLUGIN_DIR} +PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} + +echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" + +unset LD_LIBRARY_PATH + +cd ${PLUGIN_ABS_PATH} +ln -s $SCRIPTPATH/ ./ + +mkdir -pv moab/bld +cd moab +git clone https://bitbucket.org/fathomteam/moab -b Version5.1.0 +cd bld +cmake ../moab -DENABLE_HDF5=ON \ + -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_BLASLAPACK=OFF -DENABLE_FORTRAN=OFF \ + -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/moab +make -j +make install + +cd ${PLUGIN_ABS_PATH} +mkdir -pv DAGMC/bld +cd DAGMC +git clone https://github.com/bam241/DAGMC -b build_exe +cd bld +cmake ../DAGMC -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ + -DMOAB_DIR=${PLUGIN_ABS_PATH}/moab \ + -DBUILD_UWUW=ON \ + -DBUILD_TALLY=OFF \ + -DBUILD_BUILD_OBB=OFF \ + -DBUILD_MAKE_WATERTIGHT=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_STATIC_LIBS=ON \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/DAGMC +make -j +make install + + +TRELIS_INSTALL_LOC="/Applications/Trelis-17.1.app/Contents" +cd $TRELIS_INSTALL_LOC +tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar . +cp -f Trelis-17.1.app/Contents/MacOS/* MacOS/ +cp -f bin/* MacOS/ +rm -rf bin Trelis-17.1.app +ln -s MacOS bin +#cd bin +#sudo cp -pv CubitExport-Release.cmake CubitExport-Release.cmake.orig +#sudo port install gsed +#sudo gsed -i "s/\"Trelis-17.1.app\/Contents/\MacOS\"/\"bin\"/" CubitExport-Release.cmake +cd + +cd ${PLUGIN_ABS_PATH}/Trelis-plugin +git submodule update --init + +cd ${PLUGIN_ABS_PATH} +rm -rf bld +mkdir -pv bld +cd bld + +cmake .. -DCubit_DIR=${${TRELIS_INSTALL_LOC}/bin}MacOS \ + -DCUBIT_ROOT=${${TRELIS_INSTALL_LOC}/bin}MacOS \ + -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=../../TRELIS_BUILD_TEST +make -j +make install + + +# -DCMAKE_BUILD_TYPE=Release \ + + + +cd ${PLUGIN_ABS_PATH} +mkdir -p pack/MacOS/plugins/svalinn +cd pack/MacOS/plugins/svalinn + +# Copy all needed libraries into current directory +cp -pPv ${PLUGIN_ABS_PATH}/lib/* . + +# Create the Svalinn plugin tarball +cd .. +ln -sv svalinn/libsvalinn_plugin.so . +cd ../.. +tar -czvf svalinn-plugin_mac.tgz MacOS +mv -v svalinn-plugin_mac.tgz ~/ +cd .. +# rm -rf pack bld DAGMC lib moab +# rm Trelis-plugin From 4190b4673341f1d0283fd7033d1326bbd4e47744 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 15:47:02 -0600 Subject: [PATCH 03/76] commenting out gfortran --- script/build_plugin_macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 048c3efe8..cd6c0834a 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -12,8 +12,8 @@ export LD_LIBRARY_PATH=/opt/local/lib:$LD_LIBRARY_PATH sudo port selfupdate sudo port install libtool eigen3 hdf5 cmake gcc6 wget realpath -wget https://github.com/fxcoudert/gfortran-for-macOS/releases/download/10.2/gfortran-10.2-Catalina.dmg -hdiutil attach gfortran-10.2-Catalina.dmg +#wget https://github.com/fxcoudert/gfortran-for-macOS/releases/download/10.2/gfortran-10.2-Catalina.dmg +#hdiutil attach gfortran-10.2-Catalina.dmg #sudo installer -pkg /Volumes/gfortran-10.2-Catalina/gfortran.pkg -target / #hdiutil detach /Volumes/gfortran-10.2-Catalina From 52eb2f8e75790d83d49fb35996a75fb1ab7dc712 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 15:51:03 -0600 Subject: [PATCH 04/76] adding static libs to packages for linux --- script/build_plugin.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/build_plugin.sh b/script/build_plugin.sh index a422920e2..086cab457 100755 --- a/script/build_plugin.sh +++ b/script/build_plugin.sh @@ -91,12 +91,12 @@ cd pack/bin/plugins/svalinn # Copy all needed libraries into current directory cp -pPv ${PLUGIN_ABS_PATH}/lib/* . -cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.so* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.so* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.so* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.so . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.so . -cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.so.100* . +cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.a* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.a* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.a* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.a* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.a* . +cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.a* . chmod 644 * # Set the RPATH to be the current directory for the DAGMC libraries From f1e19b876bf5ac2fd049e22acf99fc2c6e73d69b Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 15:54:46 -0600 Subject: [PATCH 05/76] non interactive mode --- script/build_plugin_macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index cd6c0834a..5cc1a7a7c 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -9,8 +9,8 @@ export MANPATH=/opt/local/share/man:$MANPATH export LD_LIBRARY_PATH=/opt/local/lib:$LD_LIBRARY_PATH -sudo port selfupdate -sudo port install libtool eigen3 hdf5 cmake gcc6 wget realpath +sudo port selfupdate -N +sudo port install -N libtool eigen3 hdf5 cmake gcc6 wget realpath #wget https://github.com/fxcoudert/gfortran-for-macOS/releases/download/10.2/gfortran-10.2-Catalina.dmg #hdiutil attach gfortran-10.2-Catalina.dmg From db81d475dcc107b878c76ba96eabf8a3fce89a90 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:06:10 -0600 Subject: [PATCH 06/76] putting linux back on SHARED lib --- script/build_plugin.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/script/build_plugin.sh b/script/build_plugin.sh index 086cab457..54a6c38ab 100755 --- a/script/build_plugin.sh +++ b/script/build_plugin.sh @@ -37,7 +37,7 @@ git clone https://bitbucket.org/fathomteam/moab -b Version5.1.0 cd bld cmake ../moab -DENABLE_HDF5=ON \ -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial \ - -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DENABLE_BLASLAPACK=OFF -DENABLE_FORTRAN=OFF -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/moab @@ -55,8 +55,9 @@ cmake ../DAGMC -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ -DBUILD_TALLY=OFF \ -DBUILD_BUILD_OBB=OFF \ -DBUILD_MAKE_WATERTIGHT=ON \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_STATIC_LIBS=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=OFF \ + -DBUILD_EXE=OFF \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/DAGMC @@ -91,12 +92,12 @@ cd pack/bin/plugins/svalinn # Copy all needed libraries into current directory cp -pPv ${PLUGIN_ABS_PATH}/lib/* . -cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.a* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.a* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.a* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.a* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.a* . -cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.a* . +cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.so . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.so . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.so . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.so . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.so . +cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.so . chmod 644 * # Set the RPATH to be the current directory for the DAGMC libraries From 25d72d64a1a09c90de0d0990d8918baf2aca2210 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:32:49 -0600 Subject: [PATCH 07/76] working linux build --- script/build_plugin.sh | 12 ++++++------ script/build_plugin_macos.sh | 4 +++- test_plugin/test.jou | 6 +----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/script/build_plugin.sh b/script/build_plugin.sh index 54a6c38ab..3ce9def2f 100755 --- a/script/build_plugin.sh +++ b/script/build_plugin.sh @@ -92,12 +92,12 @@ cd pack/bin/plugins/svalinn # Copy all needed libraries into current directory cp -pPv ${PLUGIN_ABS_PATH}/lib/* . -cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.so . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.so . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.so . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.so . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.so . -cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.so . +cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.so* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.so* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.so* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.so* . +cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.so* . +cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.so* . chmod 644 * # Set the RPATH to be the current directory for the DAGMC libraries diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 5cc1a7a7c..f9fd83ab7 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -3,6 +3,7 @@ #Getting Macport curl https://distfiles.macports.org/MacPorts/MacPorts-2.6.3-10.15-Catalina.pkg --output MacPorts-2.6.3-10.15-Catalina.pkg sudo installer -pkg MacPorts-2.6.3-10.15-Catalina.pkg -target / +rm -rf MacPorts-2.6.3-10.15-Catalina.pkg export PATH=/opt/local/bin:/opt/local/sbin:$PATH export MANPATH=/opt/local/share/man:$MANPATH @@ -17,7 +18,8 @@ sudo port install -N libtool eigen3 hdf5 cmake gcc6 wget realpath #sudo installer -pkg /Volumes/gfortran-10.2-Catalina/gfortran.pkg -target / #hdiutil detach /Volumes/gfortran-10.2-Catalina - +hdiutil attach SDK/Trelis-17.1.0-Mac64.dmg +cp /Volume/Trelis-17.1.0-Mac64/Trelis-17.1.app /Applications/ cd diff --git a/test_plugin/test.jou b/test_plugin/test.jou index 53fe0f120..8a7f3dedf 100644 --- a/test_plugin/test.jou +++ b/test_plugin/test.jou @@ -1,5 +1 @@ -help mcnp -help dagmc -import mcnp test.i -export acis "test.sat" overwrite attributes_on -export dagmc "test.h5m" faceting_tolerance 1e-3 make_watertight verbose +help export From ccc3496271e3c60c308478c3f2623217a693f9e9 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:34:00 -0600 Subject: [PATCH 08/76] localised install --- script/build_plugin_macos.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index f9fd83ab7..ef5a80ade 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -18,8 +18,6 @@ sudo port install -N libtool eigen3 hdf5 cmake gcc6 wget realpath #sudo installer -pkg /Volumes/gfortran-10.2-Catalina/gfortran.pkg -target / #hdiutil detach /Volumes/gfortran-10.2-Catalina -hdiutil attach SDK/Trelis-17.1.0-Mac64.dmg -cp /Volume/Trelis-17.1.0-Mac64/Trelis-17.1.app /Applications/ cd @@ -28,6 +26,10 @@ CURRENT=$(pwd) SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" +hdiutil attach SDK/Trelis-17.1.0-Mac64.dmg +cp /Volume/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ + + mkdir ${PLUGIN_DIR} PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} @@ -72,7 +74,7 @@ make -j make install -TRELIS_INSTALL_LOC="/Applications/Trelis-17.1.app/Contents" +TRELIS_INSTALL_LOC="${PLUGIN_DIR}/Trelis-17.1.app/Contents" cd $TRELIS_INSTALL_LOC tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar . cp -f Trelis-17.1.app/Contents/MacOS/* MacOS/ From 25fafaa7831fe3e410bfdaab55b583d8fb58ba11 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:35:34 -0600 Subject: [PATCH 09/76] no interactive for macport --- script/build_plugin_macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index ef5a80ade..f0c7eeb78 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -10,8 +10,8 @@ export MANPATH=/opt/local/share/man:$MANPATH export LD_LIBRARY_PATH=/opt/local/lib:$LD_LIBRARY_PATH -sudo port selfupdate -N -sudo port install -N libtool eigen3 hdf5 cmake gcc6 wget realpath +sudo port -N selfupdate +sudo port -N install libtool eigen3 hdf5 cmake gcc6 wget realpath #wget https://github.com/fxcoudert/gfortran-for-macOS/releases/download/10.2/gfortran-10.2-Catalina.dmg #hdiutil attach gfortran-10.2-Catalina.dmg From 51c89fc757566af143f1a4f50cf516526de38493 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:39:20 -0600 Subject: [PATCH 10/76] putting the correct jou file --- test_plugin/test.jou | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test_plugin/test.jou b/test_plugin/test.jou index 8a7f3dedf..53fe0f120 100644 --- a/test_plugin/test.jou +++ b/test_plugin/test.jou @@ -1 +1,5 @@ -help export +help mcnp +help dagmc +import mcnp test.i +export acis "test.sat" overwrite attributes_on +export dagmc "test.h5m" faceting_tolerance 1e-3 make_watertight verbose From 6b60cebf750f446cf48da5475e915dbbadc6da0f Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:49:23 -0600 Subject: [PATCH 11/76] no prompt --- script/build_plugin_macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index f0c7eeb78..a881dc373 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -26,9 +26,9 @@ CURRENT=$(pwd) SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" -hdiutil attach SDK/Trelis-17.1.0-Mac64.dmg +hdiutil attach -quiet -nobrowse -noverify -noautoopen SDK/Trelis-17.1.0-Mac64.dmg cp /Volume/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ - +exit mkdir ${PLUGIN_DIR} From 1a8fd85a0228051e1bab632050e43d139071858c Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:53:15 -0600 Subject: [PATCH 12/76] adding the folder ... --- script/build_plugin_macos.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index a881dc373..701023ac2 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -26,12 +26,13 @@ CURRENT=$(pwd) SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" +mkdir ${PLUGIN_DIR} hdiutil attach -quiet -nobrowse -noverify -noautoopen SDK/Trelis-17.1.0-Mac64.dmg cp /Volume/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ exit -mkdir ${PLUGIN_DIR} + PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" From c150a0fd86606cd150e65ff9465b3ea95b58d7f9 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:58:12 -0600 Subject: [PATCH 13/76] missing s... --- script/build_plugin_macos.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 701023ac2..50c61329e 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -28,9 +28,7 @@ SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" mkdir ${PLUGIN_DIR} hdiutil attach -quiet -nobrowse -noverify -noautoopen SDK/Trelis-17.1.0-Mac64.dmg -cp /Volume/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ -exit - +cp /Volumes/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} From ecf20b72f75d7725c934ae1b61efcdf5df899408 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 16:58:46 -0600 Subject: [PATCH 14/76] detach volume... --- script/build_plugin_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 50c61329e..74a1a634a 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -29,7 +29,7 @@ PLUGIN_DIR="plugin-build" mkdir ${PLUGIN_DIR} hdiutil attach -quiet -nobrowse -noverify -noautoopen SDK/Trelis-17.1.0-Mac64.dmg cp /Volumes/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ - +hdiutil detach /Volumes/Trelis-17.1.0-Mac64 PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} From dfde6108d89bb47fa081a5d5662c1c3426a622a1 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 17:28:46 -0600 Subject: [PATCH 15/76] stoping to see what is appening --- script/build_plugin_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 74a1a634a..32de3275a 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -32,7 +32,7 @@ cp /Volumes/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ hdiutil detach /Volumes/Trelis-17.1.0-Mac64 PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} - +exit echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" unset LD_LIBRARY_PATH From 2d385163581e307ee6259663cf2a3f83be82c8a9 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 17:29:15 -0600 Subject: [PATCH 16/76] commenting port --- script/build_plugin_macos.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 32de3275a..a30df9b1c 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -1,17 +1,17 @@ #!/bin/bash #Getting Macport -curl https://distfiles.macports.org/MacPorts/MacPorts-2.6.3-10.15-Catalina.pkg --output MacPorts-2.6.3-10.15-Catalina.pkg -sudo installer -pkg MacPorts-2.6.3-10.15-Catalina.pkg -target / -rm -rf MacPorts-2.6.3-10.15-Catalina.pkg +#curl https://distfiles.macports.org/MacPorts/MacPorts-2.6.3-10.15-Catalina.pkg --output MacPorts-2.6.3-10.15-Catalina.pkg +#sudo installer -pkg MacPorts-2.6.3-10.15-Catalina.pkg -target / +#rm -rf MacPorts-2.6.3-10.15-Catalina.pkg export PATH=/opt/local/bin:/opt/local/sbin:$PATH export MANPATH=/opt/local/share/man:$MANPATH export LD_LIBRARY_PATH=/opt/local/lib:$LD_LIBRARY_PATH -sudo port -N selfupdate -sudo port -N install libtool eigen3 hdf5 cmake gcc6 wget realpath +#sudo port -N selfupdate +#sudo port -N install libtool eigen3 hdf5 cmake gcc6 wget realpath #wget https://github.com/fxcoudert/gfortran-for-macOS/releases/download/10.2/gfortran-10.2-Catalina.dmg #hdiutil attach gfortran-10.2-Catalina.dmg From 1536422b890c78d8088fdec07f87d6b15ad1b67a Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 17:30:18 -0600 Subject: [PATCH 17/76] -r for copy... removing exit --- script/build_plugin_macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index a30df9b1c..7f00a2297 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -28,11 +28,11 @@ SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" mkdir ${PLUGIN_DIR} hdiutil attach -quiet -nobrowse -noverify -noautoopen SDK/Trelis-17.1.0-Mac64.dmg -cp /Volumes/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ +cp -rf /Volumes/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ hdiutil detach /Volumes/Trelis-17.1.0-Mac64 PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} -exit + echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" unset LD_LIBRARY_PATH From 1fe457473c165cd2c2b0e659b8c357798f2b4fd1 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 18:43:27 -0600 Subject: [PATCH 18/76] fixing path --- script/build_plugin_macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 7f00a2297..9c066f912 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -94,8 +94,8 @@ rm -rf bld mkdir -pv bld cd bld -cmake .. -DCubit_DIR=${${TRELIS_INSTALL_LOC}/bin}MacOS \ - -DCUBIT_ROOT=${${TRELIS_INSTALL_LOC}/bin}MacOS \ +cmake .. -DCubit_DIR=${TRELIS_INSTALL_LOC}/bin/MacOS \ + -DCUBIT_ROOT=${TRELIS_INSTALL_LOC}/bin/MacOS \ -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=../../TRELIS_BUILD_TEST From c8ee9f95f6b33403f342973abefbe890dde5b061 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 18:58:38 -0600 Subject: [PATCH 19/76] reset path --- script/build_plugin_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 9c066f912..443f78749 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -72,7 +72,7 @@ cmake ../DAGMC -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ make -j make install - +cd TRELIS_INSTALL_LOC="${PLUGIN_DIR}/Trelis-17.1.app/Contents" cd $TRELIS_INSTALL_LOC tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar . From 044999993ffedd6560793c8179cf5e603b71d617 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 19:53:03 -0600 Subject: [PATCH 20/76] fixing path --- script/build_plugin_macos.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 443f78749..0fd2937b9 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -89,11 +89,10 @@ cd cd ${PLUGIN_ABS_PATH}/Trelis-plugin git submodule update --init -cd ${PLUGIN_ABS_PATH} +cd ${PLUGIN_ABS_PATH}/Trelis-plugin rm -rf bld mkdir -pv bld cd bld - cmake .. -DCubit_DIR=${TRELIS_INSTALL_LOC}/bin/MacOS \ -DCUBIT_ROOT=${TRELIS_INSTALL_LOC}/bin/MacOS \ -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ From 607faf74aee98e53302745238a20f828ddec126a Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 20:29:38 -0600 Subject: [PATCH 21/76] fixing path --- script/build_plugin_macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 0fd2937b9..22f01d109 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -93,8 +93,8 @@ cd ${PLUGIN_ABS_PATH}/Trelis-plugin rm -rf bld mkdir -pv bld cd bld -cmake .. -DCubit_DIR=${TRELIS_INSTALL_LOC}/bin/MacOS \ - -DCUBIT_ROOT=${TRELIS_INSTALL_LOC}/bin/MacOS \ +cmake .. -DCubit_DIR=${TRELIS_INSTALL_LOC}/MacOS \ + -DCUBIT_ROOT=${TRELIS_INSTALL_LOC}/MacOS \ -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=../../TRELIS_BUILD_TEST From e0b018ba8017bad1baf66864eaaf3e952558e9c3 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 22 Dec 2020 21:06:12 -0600 Subject: [PATCH 22/76] better path? --- script/build_plugin_macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 22f01d109..5cfe159c1 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -73,7 +73,7 @@ make -j make install cd -TRELIS_INSTALL_LOC="${PLUGIN_DIR}/Trelis-17.1.app/Contents" +TRELIS_INSTALL_LOC="~/${PLUGIN_DIR}/Trelis-17.1.app/Contents" cd $TRELIS_INSTALL_LOC tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar . cp -f Trelis-17.1.app/Contents/MacOS/* MacOS/ @@ -97,7 +97,7 @@ cmake .. -DCubit_DIR=${TRELIS_INSTALL_LOC}/MacOS \ -DCUBIT_ROOT=${TRELIS_INSTALL_LOC}/MacOS \ -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=../../TRELIS_BUILD_TEST + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH} make -j make install From afa20212f1f1945607d4003f9e526d83f8386140 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 24 Dec 2020 15:55:30 -0600 Subject: [PATCH 23/76] using abs path --- script/build_plugin_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 5cfe159c1..4e10c7b1d 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -73,7 +73,7 @@ make -j make install cd -TRELIS_INSTALL_LOC="~/${PLUGIN_DIR}/Trelis-17.1.app/Contents" +TRELIS_INSTALL_LOC="${PLUGIN_ABS_PATH}/Trelis-17.1.app/Contents" cd $TRELIS_INSTALL_LOC tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar . cp -f Trelis-17.1.app/Contents/MacOS/* MacOS/ From e31767284e942bfd2122fc52a8a59d8bf1fdfe5d Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 24 Dec 2020 16:02:42 -0600 Subject: [PATCH 24/76] fixing tar command line --- script/build_plugin_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 4e10c7b1d..11d7dad99 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -75,7 +75,7 @@ make install cd TRELIS_INSTALL_LOC="${PLUGIN_ABS_PATH}/Trelis-17.1.app/Contents" cd $TRELIS_INSTALL_LOC -tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar . +tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar cp -f Trelis-17.1.app/Contents/MacOS/* MacOS/ cp -f bin/* MacOS/ rm -rf bin Trelis-17.1.app From 18aaf0204c0c440eb6d9e53f4468aefbb28bfc44 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 24 Dec 2020 16:12:45 -0600 Subject: [PATCH 25/76] more change --- script/build_plugin_macos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 11d7dad99..c9f176a0d 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -76,6 +76,7 @@ cd TRELIS_INSTALL_LOC="${PLUGIN_ABS_PATH}/Trelis-17.1.app/Contents" cd $TRELIS_INSTALL_LOC tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar +mv Trelis-17.1/* ./ cp -f Trelis-17.1.app/Contents/MacOS/* MacOS/ cp -f bin/* MacOS/ rm -rf bin Trelis-17.1.app From 92294eff41666b937f4eebc7eecfab59984a8733 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Fri, 25 Dec 2020 13:49:18 -0600 Subject: [PATCH 26/76] patching cubitcmake --- script/CubitExport-release.cmake | 190 +++++++++++++++++++++++++++++++ script/build_plugin_macos.sh | 1 + 2 files changed, 191 insertions(+) create mode 100644 script/CubitExport-release.cmake diff --git a/script/CubitExport-release.cmake b/script/CubitExport-release.cmake new file mode 100644 index 000000000..a8a92fc79 --- /dev/null +++ b/script/CubitExport-release.cmake @@ -0,0 +1,190 @@ +#---------------------------------------------------------------- +# Generated CMake target import file for configuration "Release". +#---------------------------------------------------------------- + +# Commands may need to know the format version. +set(CMAKE_IMPORT_FILE_VERSION 1) + +# Import target "rlm_activate" for configuration "Release" +set_property(TARGET rlm_activate APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(rlm_activate PROPERTIES + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/rlm_activate" + ) + +list(APPEND _IMPORT_CHECK_TARGETS rlm_activate ) +list(APPEND _IMPORT_CHECK_FILES_FOR_rlm_activate "${_IMPORT_PREFIX}/MacOS/rlm_activate" ) + +# Import target "trelis_lm" for configuration "Release" +set_property(TARGET trelis_lm APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(trelis_lm PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Core;Qt5::Network;Qt5::Widgets" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libtrelis_lm.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libtrelis_lm.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS trelis_lm ) +list(APPEND _IMPORT_CHECK_FILES_FOR_trelis_lm "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libtrelis_lm.dylib" ) + +# Import target "clarofw" for configuration "Release" +set_property(TARGET clarofw APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(clarofw PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "trelis_lm;Qt5::Gui;Qt5::Core;cubit_python" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libclarofw.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libclarofw.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS clarofw ) +list(APPEND _IMPORT_CHECK_FILES_FOR_clarofw "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libclarofw.dylib" ) + +# Import target "navigation" for configuration "Release" +set_property(TARGET navigation APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(navigation PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Widgets" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libnavigation.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libnavigation.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS navigation ) +list(APPEND _IMPORT_CHECK_FILES_FOR_navigation "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libnavigation.dylib" ) + +# Import target "clarogui" for configuration "Release" +set_property(TARGET clarogui APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(clarogui PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "clarofw;navigation;Qt5::Core;Qt5::Widgets;cubit_python" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libclarogui.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libclarogui.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS clarogui ) +list(APPEND _IMPORT_CHECK_FILES_FOR_clarogui "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libclarogui.dylib" ) + +# Import target "gtcAttrib" for configuration "Release" +set_property(TARGET gtcAttrib APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(gtcAttrib PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "SpaACIS" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libgtcAttrib.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libgtcAttrib.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS gtcAttrib ) +list(APPEND _IMPORT_CHECK_FILES_FOR_gtcAttrib "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libgtcAttrib.dylib" ) + +# Import target "cubit_sizing_source" for configuration "Release" +set_property(TARGET cubit_sizing_source APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(cubit_sizing_source PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "cubit_util" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_sizing_source.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libcubit_sizing_source.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS cubit_sizing_source ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_sizing_source "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_sizing_source.dylib" ) + +# Import target "cubit_mdb" for configuration "Release" +set_property(TARGET cubit_mdb APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(cubit_mdb PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_mdb.a" + ) + +list(APPEND _IMPORT_CHECK_TARGETS cubit_mdb ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_mdb "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_mdb.a" ) + +# Import target "cubit_sim" for configuration "Release" +set_property(TARGET cubit_sim APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(cubit_sim PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_sim.a" + ) + +list(APPEND _IMPORT_CHECK_TARGETS cubit_sim ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_sim "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_sim.a" ) + +# Import target "material_commands" for configuration "Release" +set_property(TARGET material_commands APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(material_commands PROPERTIES + IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/plugins/libmaterial_commands.so" + IMPORTED_NO_SONAME_RELEASE "TRUE" + ) + +list(APPEND _IMPORT_CHECK_TARGETS material_commands ) +list(APPEND _IMPORT_CHECK_FILES_FOR_material_commands "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/plugins/libmaterial_commands.so" ) + +# Import target "cubit_parsing_core" for configuration "Release" +set_property(TARGET cubit_parsing_core APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(cubit_parsing_core PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_parsing_core.a" + ) + +list(APPEND _IMPORT_CHECK_TARGETS cubit_parsing_core ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_parsing_core "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_parsing_core.a" ) + +# Import target "cubiti" for configuration "Release" +set_property(TARGET cubiti APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(cubiti PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "trelis_lm;cubit_sizing_source;showviz_cubit;showviz_sim;showviz_mesh;showviz_base;cubit_smd;gtcAttrib;SpaACIS;cubit_geom;mg_tetra_hpc;mg_adapt;mg_tetra;mg_surfopt;mg_cadsurf;meshgems;meshgems_stubs;Qt5::Core" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubiti19.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libcubiti19.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS cubiti ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubiti "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubiti19.dylib" ) + +# Import target "cubit_python" for configuration "Release" +set_property(TARGET cubit_python APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(cubit_python PROPERTIES + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_python.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libcubit_python.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS cubit_python ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_python.dylib" ) + +# Import target "cubit_python3" for configuration "Release" +set_property(TARGET cubit_python3 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(cubit_python3 PROPERTIES + IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/python3/libcubit_python3.so" + IMPORTED_NO_SONAME_RELEASE "TRUE" + ) + +list(APPEND _IMPORT_CHECK_TARGETS cubit_python3 ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python3 "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/python3/libcubit_python3.so" ) + +# Import target "cubit_python2" for configuration "Release" +set_property(TARGET cubit_python2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(cubit_python2 PROPERTIES + IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/python2/libcubit_python2.so" + IMPORTED_NO_SONAME_RELEASE "TRUE" + ) + +list(APPEND _IMPORT_CHECK_TARGETS cubit_python2 ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python2 "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/python2/libcubit_python2.so" ) + +# Import target "treemodel" for configuration "Release" +set_property(TARGET treemodel APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(treemodel PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "cubiti;Qt5::Core" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libtreemodel.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libtreemodel.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS treemodel ) +list(APPEND _IMPORT_CHECK_FILES_FOR_treemodel "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libtreemodel.dylib" ) + +# Import target "pickwidget" for configuration "Release" +set_property(TARGET pickwidget APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(pickwidget PROPERTIES + IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Widgets" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libpickwidget.dylib" + IMPORTED_SONAME_RELEASE "@rpath/libpickwidget.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS pickwidget ) +list(APPEND _IMPORT_CHECK_FILES_FOR_pickwidget "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libpickwidget.dylib" ) + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index c9f176a0d..11254cca4 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -91,6 +91,7 @@ cd ${PLUGIN_ABS_PATH}/Trelis-plugin git submodule update --init cd ${PLUGIN_ABS_PATH}/Trelis-plugin +cp script/CubitExport-release.cmake ${TRELIS_INSTALL_LOC}/MacOS/ rm -rf bld mkdir -pv bld cd bld From 78f69cb48b0fb1a5138a8e304afa39563ba7b332 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Sat, 26 Dec 2020 11:56:01 -0600 Subject: [PATCH 27/76] fixing cmake file --- script/CubitExport-release.cmake | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/script/CubitExport-release.cmake b/script/CubitExport-release.cmake index a8a92fc79..e9a2cba9e 100644 --- a/script/CubitExport-release.cmake +++ b/script/CubitExport-release.cmake @@ -18,173 +18,173 @@ list(APPEND _IMPORT_CHECK_FILES_FOR_rlm_activate "${_IMPORT_PREFIX}/MacOS/rlm_ac set_property(TARGET trelis_lm APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(trelis_lm PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Core;Qt5::Network;Qt5::Widgets" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libtrelis_lm.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libtrelis_lm.dylib" IMPORTED_SONAME_RELEASE "@rpath/libtrelis_lm.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS trelis_lm ) -list(APPEND _IMPORT_CHECK_FILES_FOR_trelis_lm "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libtrelis_lm.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_trelis_lm "${_IMPORT_PREFIX}/MacOS/libtrelis_lm.dylib" ) # Import target "clarofw" for configuration "Release" set_property(TARGET clarofw APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(clarofw PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "trelis_lm;Qt5::Gui;Qt5::Core;cubit_python" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libclarofw.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libclarofw.dylib" IMPORTED_SONAME_RELEASE "@rpath/libclarofw.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS clarofw ) -list(APPEND _IMPORT_CHECK_FILES_FOR_clarofw "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libclarofw.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_clarofw "${_IMPORT_PREFIX}/MacOS/libclarofw.dylib" ) # Import target "navigation" for configuration "Release" set_property(TARGET navigation APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(navigation PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Widgets" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libnavigation.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libnavigation.dylib" IMPORTED_SONAME_RELEASE "@rpath/libnavigation.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS navigation ) -list(APPEND _IMPORT_CHECK_FILES_FOR_navigation "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libnavigation.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_navigation "${_IMPORT_PREFIX}/MacOS/libnavigation.dylib" ) # Import target "clarogui" for configuration "Release" set_property(TARGET clarogui APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(clarogui PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "clarofw;navigation;Qt5::Core;Qt5::Widgets;cubit_python" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libclarogui.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libclarogui.dylib" IMPORTED_SONAME_RELEASE "@rpath/libclarogui.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS clarogui ) -list(APPEND _IMPORT_CHECK_FILES_FOR_clarogui "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libclarogui.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_clarogui "${_IMPORT_PREFIX}/MacOS/libclarogui.dylib" ) # Import target "gtcAttrib" for configuration "Release" set_property(TARGET gtcAttrib APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(gtcAttrib PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "SpaACIS" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libgtcAttrib.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libgtcAttrib.dylib" IMPORTED_SONAME_RELEASE "@rpath/libgtcAttrib.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS gtcAttrib ) -list(APPEND _IMPORT_CHECK_FILES_FOR_gtcAttrib "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libgtcAttrib.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_gtcAttrib "${_IMPORT_PREFIX}/MacOS/libgtcAttrib.dylib" ) # Import target "cubit_sizing_source" for configuration "Release" set_property(TARGET cubit_sizing_source APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(cubit_sizing_source PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "cubit_util" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_sizing_source.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_sizing_source.dylib" IMPORTED_SONAME_RELEASE "@rpath/libcubit_sizing_source.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS cubit_sizing_source ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_sizing_source "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_sizing_source.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_sizing_source "${_IMPORT_PREFIX}/MacOS/libcubit_sizing_source.dylib" ) # Import target "cubit_mdb" for configuration "Release" set_property(TARGET cubit_mdb APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(cubit_mdb PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_mdb.a" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_mdb.a" ) list(APPEND _IMPORT_CHECK_TARGETS cubit_mdb ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_mdb "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_mdb.a" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_mdb "${_IMPORT_PREFIX}/MacOS/libcubit_mdb.a" ) # Import target "cubit_sim" for configuration "Release" set_property(TARGET cubit_sim APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(cubit_sim PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_sim.a" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_sim.a" ) list(APPEND _IMPORT_CHECK_TARGETS cubit_sim ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_sim "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_sim.a" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_sim "${_IMPORT_PREFIX}/MacOS/libcubit_sim.a" ) # Import target "material_commands" for configuration "Release" set_property(TARGET material_commands APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(material_commands PROPERTIES IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/plugins/libmaterial_commands.so" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/plugins/libmaterial_commands.so" IMPORTED_NO_SONAME_RELEASE "TRUE" ) list(APPEND _IMPORT_CHECK_TARGETS material_commands ) -list(APPEND _IMPORT_CHECK_FILES_FOR_material_commands "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/plugins/libmaterial_commands.so" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_material_commands "${_IMPORT_PREFIX}/MacOS/plugins/libmaterial_commands.so" ) # Import target "cubit_parsing_core" for configuration "Release" set_property(TARGET cubit_parsing_core APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(cubit_parsing_core PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_parsing_core.a" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_parsing_core.a" ) list(APPEND _IMPORT_CHECK_TARGETS cubit_parsing_core ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_parsing_core "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_parsing_core.a" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_parsing_core "${_IMPORT_PREFIX}/MacOS/libcubit_parsing_core.a" ) # Import target "cubiti" for configuration "Release" set_property(TARGET cubiti APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(cubiti PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "trelis_lm;cubit_sizing_source;showviz_cubit;showviz_sim;showviz_mesh;showviz_base;cubit_smd;gtcAttrib;SpaACIS;cubit_geom;mg_tetra_hpc;mg_adapt;mg_tetra;mg_surfopt;mg_cadsurf;meshgems;meshgems_stubs;Qt5::Core" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubiti19.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubiti19.dylib" IMPORTED_SONAME_RELEASE "@rpath/libcubiti19.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS cubiti ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubiti "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubiti19.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubiti "${_IMPORT_PREFIX}/MacOS/libcubiti19.dylib" ) # Import target "cubit_python" for configuration "Release" set_property(TARGET cubit_python APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(cubit_python PROPERTIES - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_python.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_python.dylib" IMPORTED_SONAME_RELEASE "@rpath/libcubit_python.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS cubit_python ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libcubit_python.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python "${_IMPORT_PREFIX}/MacOS/libcubit_python.dylib" ) # Import target "cubit_python3" for configuration "Release" set_property(TARGET cubit_python3 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(cubit_python3 PROPERTIES IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/python3/libcubit_python3.so" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/python3/libcubit_python3.so" IMPORTED_NO_SONAME_RELEASE "TRUE" ) list(APPEND _IMPORT_CHECK_TARGETS cubit_python3 ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python3 "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/python3/libcubit_python3.so" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python3 "${_IMPORT_PREFIX}/MacOS/python3/libcubit_python3.so" ) # Import target "cubit_python2" for configuration "Release" set_property(TARGET cubit_python2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(cubit_python2 PROPERTIES IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/python2/libcubit_python2.so" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/python2/libcubit_python2.so" IMPORTED_NO_SONAME_RELEASE "TRUE" ) list(APPEND _IMPORT_CHECK_TARGETS cubit_python2 ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python2 "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/python2/libcubit_python2.so" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python2 "${_IMPORT_PREFIX}/MacOS/python2/libcubit_python2.so" ) # Import target "treemodel" for configuration "Release" set_property(TARGET treemodel APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(treemodel PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "cubiti;Qt5::Core" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libtreemodel.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libtreemodel.dylib" IMPORTED_SONAME_RELEASE "@rpath/libtreemodel.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS treemodel ) -list(APPEND _IMPORT_CHECK_FILES_FOR_treemodel "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libtreemodel.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_treemodel "${_IMPORT_PREFIX}/MacOS/libtreemodel.dylib" ) # Import target "pickwidget" for configuration "Release" set_property(TARGET pickwidget APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(pickwidget PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Widgets" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libpickwidget.dylib" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libpickwidget.dylib" IMPORTED_SONAME_RELEASE "@rpath/libpickwidget.dylib" ) list(APPEND _IMPORT_CHECK_TARGETS pickwidget ) -list(APPEND _IMPORT_CHECK_FILES_FOR_pickwidget "${_IMPORT_PREFIX}/Trelis-17.1.app/Contents/MacOS/libpickwidget.dylib" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_pickwidget "${_IMPORT_PREFIX}/MacOS/libpickwidget.dylib" ) # Commands beyond this point should not need to know the version. set(CMAKE_IMPORT_FILE_VERSION) From c535f296a023028ca261a050976940528f036f0c Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 10:38:19 -0600 Subject: [PATCH 28/76] new version of mcnp2cad --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 595874c5f..3bed333f1 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 595874c5f0bad376c385d2cf57c278cf912c8f5b +Subproject commit 3bed333f1d0f09670be8fcda58ee9923562e81f2 From 90f6c764bdb21c951cf7c0b1423f8effacd0a91b Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 10:53:45 -0600 Subject: [PATCH 29/76] update mcnp2cad version --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 3bed333f1..bb7234a63 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 3bed333f1d0f09670be8fcda58ee9923562e81f2 +Subproject commit bb7234a63e5b5f1e577a3e50ef2eaf80cea04f15 From e4e41bbe70507a73433c597084027492513dcbee Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 11:16:12 -0600 Subject: [PATCH 30/76] updating mcnp2cad --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index bb7234a63..876a7502c 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit bb7234a63e5b5f1e577a3e50ef2eaf80cea04f15 +Subproject commit 876a7502c04993e8ddbc20f7e30fe01e5d968ae8 From 37d798ec721d227310c3519764ea899fe8757b7d Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 11:26:58 -0600 Subject: [PATCH 31/76] update mcn2cad version --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 876a7502c..1611bd274 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 876a7502c04993e8ddbc20f7e30fe01e5d968ae8 +Subproject commit 1611bd274241f9c95bfdaf31a7591d57955914ee From 34acb582030d5974df85a080be1280b450699198 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 11:50:43 -0600 Subject: [PATCH 32/76] update commit number --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 1611bd274..bc2f4a8ee 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 1611bd274241f9c95bfdaf31a7591d57955914ee +Subproject commit bc2f4a8eea5561c2ad473a49f1825913ace639e4 From 9f8a7cb4920a8b23065230012f7b05938a5cdfc8 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 12:01:08 -0600 Subject: [PATCH 33/76] new mcnp2cad git commit --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index bc2f4a8ee..29084daa4 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit bc2f4a8eea5561c2ad473a49f1825913ace639e4 +Subproject commit 29084daa47b0f43cd2e9289d1cdc77c0bd495269 From 4e75bc9238fb601e9ef9fc6bb2ea77422ef355e8 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 12:22:45 -0600 Subject: [PATCH 34/76] update commit number --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 29084daa4..bd9e9f300 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 29084daa47b0f43cd2e9289d1cdc77c0bd495269 +Subproject commit bd9e9f30054957239857f6157d009281bc0ff63d From 4b718b5b4c8acb8b8ec9997ad3bab104d5c5d20f Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 12:52:03 -0600 Subject: [PATCH 35/76] update commit number --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index bd9e9f300..5deba6380 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit bd9e9f30054957239857f6157d009281bc0ff63d +Subproject commit 5deba638022db32c7e1ac4243517ee0e9e8206a4 From 8809c8963f8570be25bd006cf5b075ecc0232975 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 13:10:44 -0600 Subject: [PATCH 36/76] udparte commit --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 5deba6380..f33d5c13a 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 5deba638022db32c7e1ac4243517ee0e9e8206a4 +Subproject commit f33d5c13a14557aef5b007f47752fba8fc4b22e9 From 040918f9a2fb5c3fe23b425467b0137bfc1612ff Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 13:22:28 -0600 Subject: [PATCH 37/76] update commit --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index f33d5c13a..0839010df 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit f33d5c13a14557aef5b007f47752fba8fc4b22e9 +Subproject commit 0839010df6a8a7fd4bbc9ffa60e984dbe1a0a4a3 From ccd3a9c0ed415ec981362d03c27129dd95dad6a1 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 13:30:47 -0600 Subject: [PATCH 38/76] update commit number --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 0839010df..7dd4123ee 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 0839010df6a8a7fd4bbc9ffa60e984dbe1a0a4a3 +Subproject commit 7dd4123ee11b516067dbff27f8efaa331d8d366b From 3880c480941b4e7c57808d4a57917f96a2205b1b Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 13:57:24 -0600 Subject: [PATCH 39/76] update commit --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 7dd4123ee..0034ec404 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 7dd4123ee11b516067dbff27f8efaa331d8d366b +Subproject commit 0034ec40483e8355861e6d724e3f53f449fc9576 From b0b451ded3b9c8850d491ad6e192a7dc9ec393e4 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 14:08:43 -0600 Subject: [PATCH 40/76] new commits --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 0034ec404..29e03dfdd 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 0034ec40483e8355861e6d724e3f53f449fc9576 +Subproject commit 29e03dfddd015642ab55c1782b65f3fbf51d59a3 From 3caa7adc007bf97915a45e9cb65e3f06ac7f71f5 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 14:27:38 -0600 Subject: [PATCH 41/76] new commits --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 29e03dfdd..781f442a9 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 29e03dfddd015642ab55c1782b65f3fbf51d59a3 +Subproject commit 781f442a94847c29b131a4937be95f19c8b5655d From d972a8ff5630f0cd906f1738dceeb76cb4444c52 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 15:19:11 -0600 Subject: [PATCH 42/76] update commit --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 781f442a9..d801f2d6b 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 781f442a94847c29b131a4937be95f19c8b5655d +Subproject commit d801f2d6ba0e1b77872a1b017dfa31b165791ed3 From 32488ca66559610534cf7d6974197c3d49d69d12 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 15:35:36 -0600 Subject: [PATCH 43/76] update commit --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index d801f2d6b..ae27c28ef 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit d801f2d6ba0e1b77872a1b017dfa31b165791ed3 +Subproject commit ae27c28ef151fd7ab8afc1b667b320076d06aba1 From ab2cd9b9d91625ef968059745b7b48d0e23565f6 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 16:03:41 -0600 Subject: [PATCH 44/76] cubit_geom cubit_util required ? --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 448c6be17..793052bd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ list(APPEND CMAKE_PREFIX_PATH ${CUBIT_ROOT}/bin) find_package(Cubit REQUIRED CONFIG) include_directories(${CUBIT_INCLUDE_DIRS}) link_directories(${Cubit_DIR}) -set(CUBIT_LIBS cubiti19 cubit_geom cubit_util) +set(CUBIT_LIBS cubiti19 )#cubit_geom cubit_util) message(STATUS "Cubit_DIR: ${Cubit_DIR}") message(STATUS "CUBIT_INCLUDE_DIRS: ${CUBIT_INCLUDE_DIRS}") From 5573a6c212d1d0b2f6e7f6f349ae8e60482a175b Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 16:11:21 -0600 Subject: [PATCH 45/76] cubit_util needed ? --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 793052bd6..89d6b5496 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ list(APPEND CMAKE_PREFIX_PATH ${CUBIT_ROOT}/bin) find_package(Cubit REQUIRED CONFIG) include_directories(${CUBIT_INCLUDE_DIRS}) link_directories(${Cubit_DIR}) -set(CUBIT_LIBS cubiti19 )#cubit_geom cubit_util) +set(CUBIT_LIBS cubiti19 cubit_util)#cubit_geom cubit_util) message(STATUS "Cubit_DIR: ${Cubit_DIR}") message(STATUS "CUBIT_INCLUDE_DIRS: ${CUBIT_INCLUDE_DIRS}") From 07f8c48a54248cbef5289b7ae9f264f44e21392b Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 4 Jan 2021 16:18:58 -0600 Subject: [PATCH 46/76] cancell changes --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89d6b5496..448c6be17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ list(APPEND CMAKE_PREFIX_PATH ${CUBIT_ROOT}/bin) find_package(Cubit REQUIRED CONFIG) include_directories(${CUBIT_INCLUDE_DIRS}) link_directories(${Cubit_DIR}) -set(CUBIT_LIBS cubiti19 cubit_util)#cubit_geom cubit_util) +set(CUBIT_LIBS cubiti19 cubit_geom cubit_util) message(STATUS "Cubit_DIR: ${Cubit_DIR}") message(STATUS "CUBIT_INCLUDE_DIRS: ${CUBIT_INCLUDE_DIRS}") From 7025f37d59c8d4c291854c52753b2b1ecce8a926 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 5 Jan 2021 10:56:13 -0600 Subject: [PATCH 47/76] update commit number --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index ae27c28ef..1fe2038b6 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit ae27c28ef151fd7ab8afc1b667b320076d06aba1 +Subproject commit 1fe2038b614b1b496310fb1d047636ce038c86b3 From 2d0c4e2473ab16e23855b672aa6aea964467d764 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 5 Jan 2021 10:58:54 -0600 Subject: [PATCH 48/76] update script to basic location --- script/build_plugin_macos.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh index 11254cca4..11c4f5232 100755 --- a/script/build_plugin_macos.sh +++ b/script/build_plugin_macos.sh @@ -28,7 +28,8 @@ SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" mkdir ${PLUGIN_DIR} hdiutil attach -quiet -nobrowse -noverify -noautoopen SDK/Trelis-17.1.0-Mac64.dmg -cp -rf /Volumes/Trelis-17.1.0-Mac64/Trelis-17.1.app ${PLUGIN_DIR}/ +rm -rf /Applications/Trelis-17.1.app +cp -rf /Volumes/Trelis-17.1.0-Mac64/Trelis-17.1.app /Applications/ hdiutil detach /Volumes/Trelis-17.1.0-Mac64 PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} @@ -73,7 +74,7 @@ make -j make install cd -TRELIS_INSTALL_LOC="${PLUGIN_ABS_PATH}/Trelis-17.1.app/Contents" +TRELIS_INSTALL_LOC="/Applications/Trelis-17.1.app/Contents" cd $TRELIS_INSTALL_LOC tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar mv Trelis-17.1/* ./ From 80c32060008501fb9391727c679df1dd7fd928d3 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 6 Jan 2021 16:46:52 -0600 Subject: [PATCH 49/76] reformating build --- script/build_plugin.sh | 109 +++------------------------------- script/linux_share_build.sh | 113 ++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 101 deletions(-) create mode 100644 script/linux_share_build.sh diff --git a/script/build_plugin.sh b/script/build_plugin.sh index 3ce9def2f..cbc98209a 100755 --- a/script/build_plugin.sh +++ b/script/build_plugin.sh @@ -1,117 +1,24 @@ #!/bin/bash - -cd /Trelis-sdk -dpkg -i Trelis-$1-Lin64.deb - -cd /opt -tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz -cd /opt/Trelis-16.5 -tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz - -TZ=America/Chicago -ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -apt-get update -y -apt-get install -y g++ autogen autoconf libtool libeigen3-dev libhdf5-dev patchelf gfortran git cmake - -cd - -# Setup CURRENT=$(pwd) SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" - -mkdir ${PLUGIN_DIR} PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} -echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" - -unset LD_LIBRARY_PATH +source ${SCRIPTPATH}/script/linux_share_build.sh -cd ${PLUGIN_ABS_PATH} -ln -s $SCRIPTPATH/ ./ +install_prerequise +setup_folder -mkdir -pv moab/bld -cd moab -git clone https://bitbucket.org/fathomteam/moab -b Version5.1.0 -cd bld -cmake ../moab -DENABLE_HDF5=ON \ - -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial \ - -DBUILD_SHARED_LIBS=ON \ - -DENABLE_BLASLAPACK=OFF -DENABLE_FORTRAN=OFF -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ - -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/moab +build_moab +build_dagmc -make -j`grep -c processor /proc/cpuinfo` -make install +setup_Trelis_sdk +build_plugin +build_plugin_pkg -cd ${PLUGIN_ABS_PATH} -mkdir -pv DAGMC/bld -cd DAGMC -git clone https://github.com/bam241/DAGMC -b build_exe -cd bld -cmake ../DAGMC -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ - -DMOAB_DIR=${PLUGIN_ABS_PATH}/moab \ - -DBUILD_UWUW=ON \ - -DBUILD_TALLY=OFF \ - -DBUILD_BUILD_OBB=OFF \ - -DBUILD_MAKE_WATERTIGHT=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_STATIC_LIBS=OFF \ - -DBUILD_EXE=OFF \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/DAGMC -make -j`grep -c processor /proc/cpuinfo` -make install -cd ${PLUGIN_ABS_PATH}/Trelis-plugin -git submodule update --init - -cd ${PLUGIN_ABS_PATH} -mkdir -pv bld -cd bld -ls /opt/Trelis-${1::4} -ls /opt/Trelis-* -ls /opt -cmake ../Trelis-plugin -DCUBIT_ROOT=/opt/Trelis-${1::4} \ - -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH} -make -j`grep -c processor /proc/cpuinfo` -make install -echo " cmake ../Trelis-plugin -DCubit_DIR=/opt/Trelis-${1::4} \ - -DCUBIT_ROOT=/opt/Trelis-${1::4} \ - -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH} " - -cd ${PLUGIN_ABS_PATH} -mkdir -p pack/bin/plugins/svalinn -cd pack/bin/plugins/svalinn - -# Copy all needed libraries into current directory -cp -pPv ${PLUGIN_ABS_PATH}/lib/* . -cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.so* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.so* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.so* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.so* . -cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.so* . -cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.so* . -chmod 644 * - -# Set the RPATH to be the current directory for the DAGMC libraries -patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libMOAB.so -patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libdagmc.so -patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libmakeWatertight.so -patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libpyne_dagmc.so -patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libuwuw.so - -# Create the Svalinn plugin tarball -cd .. -ln -sv svalinn/libsvalinn_plugin.so . -cd ../.. -tar --sort=name -czvf svalinn-plugin_linux_$1.tgz bin mv -v svalinn-plugin_linux_$1.tgz /Trelis-sdk cd .. #rm -rf pack bld DAGMC lib moab diff --git a/script/linux_share_build.sh b/script/linux_share_build.sh new file mode 100644 index 000000000..c0dc00364 --- /dev/null +++ b/script/linux_share_build.sh @@ -0,0 +1,113 @@ +#!/bin/bash + + + +function install_prerequise() { + TZ=America/Chicago + ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + apt-get update -y + apt-get install -y g++ autogen autoconf libtool libeigen3-dev libhdf5-dev patchelf gfortran git cmake +} + +function setup_folder() { + + mkdir ${PLUGIN_DIR} + echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" + + unset LD_LIBRARY_PATH + + cd ${PLUGIN_ABS_PATH} + ln -s $SCRIPTPATH/ ./ +} + +function build_moab() { + mkdir -pv moab/bld + cd moab + git clone https://bitbucket.org/fathomteam/moab -b Version5.1.0 + cd bld + cmake ../moab -DENABLE_HDF5=ON \ + -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial \ + -DBUILD_SHARED_LIBS=ON \ + -DENABLE_BLASLAPACK=OFF -DENABLE_FORTRAN=OFF -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/moab + + make -j`grep -c processor /proc/cpuinfo` + make install + cd ../.. + #rm -rf moab/moab moab/bld + cd .. +} + + +function build_dagmc(){ + mkdir -pv DAGMC/bld + cd DAGMC + git clone https://github.com/bam241/DAGMC -b build_exe + cd bld + cmake ../DAGMC -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ + -DMOAB_DIR=${PLUGIN_ABS_PATH}/moab \ + -DBUILD_UWUW=ON \ + -DBUILD_TALLY=OFF \ + -DBUILD_BUILD_OBB=OFF \ + -DBUILD_MAKE_WATERTIGHT=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=OFF \ + -DBUILD_EXE=OFF \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/DAGMC + make -j`grep -c processor /proc/cpuinfo` + make install + cd ../.. + rm -rf DAGMC/DAGMC DAGCM/bld +} + +function setup_Trelis_sdk() { +cd /Trelis-sdk +dpkg -i Trelis-$1-Lin64.deb + +cd /opt +tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz +cd /opt/Trelis-16.5 +tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz +} + +function build_plugin(){ + cd Trelis-plugin + git submodule update --init + mkdir -pv bld + cmake ../Trelis-plugin -DCUBIT_ROOT=/opt/Trelis-${1::4} \ + -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH} + make -j`grep -c processor /proc/cpuinfo` + make install +} + +function build_plugin_pkg(){ + mkdir -p pack/bin/plugins/svalinn + cd pack/bin/plugins/svalinn + + # Copy all needed libraries into current directory + cp -pPv ${PLUGIN_ABS_PATH}/lib/* . + cp -pPv ${PLUGIN_ABS_PATH}/moab/lib/libMOAB.so* . + cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libdagmc.so* . + cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libmakeWatertight.so* . + cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libpyne_dagmc.so* . + cp -pPv ${PLUGIN_ABS_PATH}/DAGMC/lib/libuwuw.so* . + cp -pPv /usr/lib/x86_64-linux-gnu/libhdf5_serial.so* . + chmod 644 * + + # Set the RPATH to be the current directory for the DAGMC libraries + patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libMOAB.so + patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libdagmc.so + patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libmakeWatertight.so + patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libpyne_dagmc.so + patchelf --set-rpath /opt/Trelis-${1::4}/bin/plugins/svalinn libuwuw.so + + # Create the Svalinn plugin tarball + cd .. + ln -sv svalinn/libsvalinn_plugin.so . + cd ../.. + tar --sort=name -czvf svalinn-plugin_linux_$1.tgz bin +} \ No newline at end of file From 54d1b6b9f0280eb428938cc8023f0d6e71eb6e12 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 6 Jan 2021 16:57:55 -0600 Subject: [PATCH 50/76] back to same results --- script/build_plugin.sh | 3 ++- script/linux_share_build.sh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/script/build_plugin.sh b/script/build_plugin.sh index cbc98209a..2835212c7 100755 --- a/script/build_plugin.sh +++ b/script/build_plugin.sh @@ -8,12 +8,13 @@ PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} source ${SCRIPTPATH}/script/linux_share_build.sh install_prerequise +setup_Trelis_sdk + setup_folder build_moab build_dagmc -setup_Trelis_sdk build_plugin build_plugin_pkg diff --git a/script/linux_share_build.sh b/script/linux_share_build.sh index c0dc00364..e3f2fd269 100644 --- a/script/linux_share_build.sh +++ b/script/linux_share_build.sh @@ -34,7 +34,7 @@ function build_moab() { make -j`grep -c processor /proc/cpuinfo` make install cd ../.. - #rm -rf moab/moab moab/bld + rm -rf moab/moab moab/bld cd .. } @@ -75,7 +75,9 @@ tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz function build_plugin(){ cd Trelis-plugin git submodule update --init + cd ../ mkdir -pv bld + cd bld cmake ../Trelis-plugin -DCUBIT_ROOT=/opt/Trelis-${1::4} \ -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ -DCMAKE_BUILD_TYPE=Release \ From cc15fa97d5403f59cb105f13212d92b44a5e702b Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 6 Jan 2021 20:14:27 -0600 Subject: [PATCH 51/76] working --- script/build_plugin.sh | 8 ++++---- script/linux_share_build.sh | 28 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/script/build_plugin.sh b/script/build_plugin.sh index 2835212c7..7bb0d3189 100755 --- a/script/build_plugin.sh +++ b/script/build_plugin.sh @@ -3,20 +3,20 @@ CURRENT=$(pwd) SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" -PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} +PLUGIN_ABS_PATH="" source ${SCRIPTPATH}/script/linux_share_build.sh install_prerequise -setup_Trelis_sdk setup_folder build_moab build_dagmc -build_plugin -build_plugin_pkg +setup_Trelis_sdk $1 +build_plugin $1 +build_plugin_pkg $1 diff --git a/script/linux_share_build.sh b/script/linux_share_build.sh index e3f2fd269..912014cdf 100644 --- a/script/linux_share_build.sh +++ b/script/linux_share_build.sh @@ -6,21 +6,23 @@ function install_prerequise() { TZ=America/Chicago ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone apt-get update -y - apt-get install -y g++ autogen autoconf libtool libeigen3-dev libhdf5-dev patchelf gfortran git cmake + apt-get install -y g++ libtool libeigen3-dev libhdf5-dev patchelf git cmake } function setup_folder() { - + cd ${CURRENT} mkdir ${PLUGIN_DIR} echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" unset LD_LIBRARY_PATH - cd ${PLUGIN_ABS_PATH} + cd ${PLUGIN_DIR} + PLUGIN_ABS_PATH=$(pwd) ln -s $SCRIPTPATH/ ./ } function build_moab() { + cd ${PLUGIN_ABS_PATH} mkdir -pv moab/bld cd moab git clone https://bitbucket.org/fathomteam/moab -b Version5.1.0 @@ -28,18 +30,20 @@ function build_moab() { cmake ../moab -DENABLE_HDF5=ON \ -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial \ -DBUILD_SHARED_LIBS=ON \ - -DENABLE_BLASLAPACK=OFF -DENABLE_FORTRAN=OFF -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ + -DENABLE_BLASLAPACK=OFF \ + -DENABLE_FORTRAN=OFF \ + -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/moab make -j`grep -c processor /proc/cpuinfo` make install cd ../.. rm -rf moab/moab moab/bld - cd .. } function build_dagmc(){ + cd ${PLUGIN_ABS_PATH} mkdir -pv DAGMC/bld cd DAGMC git clone https://github.com/bam241/DAGMC -b build_exe @@ -63,16 +67,17 @@ function build_dagmc(){ } function setup_Trelis_sdk() { -cd /Trelis-sdk -dpkg -i Trelis-$1-Lin64.deb + cd /Trelis-sdk + dpkg -i Trelis-$1-Lin64.deb -cd /opt -tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz -cd /opt/Trelis-16.5 -tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz + cd /opt + tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz + cd /opt/Trelis-16.5 + tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz } function build_plugin(){ + cd ${PLUGIN_ABS_PATH} cd Trelis-plugin git submodule update --init cd ../ @@ -87,6 +92,7 @@ function build_plugin(){ } function build_plugin_pkg(){ + cd ${PLUGIN_ABS_PATH} mkdir -p pack/bin/plugins/svalinn cd pack/bin/plugins/svalinn From 90e1193a9d2c87f081c84a2a8d351f93ac78039e Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 6 Jan 2021 20:17:25 -0600 Subject: [PATCH 52/76] readd cleaning --- script/build_plugin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/build_plugin.sh b/script/build_plugin.sh index 7bb0d3189..a12084157 100755 --- a/script/build_plugin.sh +++ b/script/build_plugin.sh @@ -22,5 +22,5 @@ build_plugin_pkg $1 mv -v svalinn-plugin_linux_$1.tgz /Trelis-sdk cd .. -#rm -rf pack bld DAGMC lib moab -#rm Trelis-plugin +rm -rf pack bld DAGMC lib moab +rm Trelis-plugin From a97af6384d17eead7f6c34c6861360789ff161c5 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 11 Feb 2021 15:26:55 -0600 Subject: [PATCH 53/76] cleaning --- script/CubitExport-release.cmake | 190 ------------------------------- script/build_plugin_macos.sh | 127 --------------------- 2 files changed, 317 deletions(-) delete mode 100644 script/CubitExport-release.cmake delete mode 100755 script/build_plugin_macos.sh diff --git a/script/CubitExport-release.cmake b/script/CubitExport-release.cmake deleted file mode 100644 index e9a2cba9e..000000000 --- a/script/CubitExport-release.cmake +++ /dev/null @@ -1,190 +0,0 @@ -#---------------------------------------------------------------- -# Generated CMake target import file for configuration "Release". -#---------------------------------------------------------------- - -# Commands may need to know the format version. -set(CMAKE_IMPORT_FILE_VERSION 1) - -# Import target "rlm_activate" for configuration "Release" -set_property(TARGET rlm_activate APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(rlm_activate PROPERTIES - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/rlm_activate" - ) - -list(APPEND _IMPORT_CHECK_TARGETS rlm_activate ) -list(APPEND _IMPORT_CHECK_FILES_FOR_rlm_activate "${_IMPORT_PREFIX}/MacOS/rlm_activate" ) - -# Import target "trelis_lm" for configuration "Release" -set_property(TARGET trelis_lm APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(trelis_lm PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Core;Qt5::Network;Qt5::Widgets" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libtrelis_lm.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libtrelis_lm.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS trelis_lm ) -list(APPEND _IMPORT_CHECK_FILES_FOR_trelis_lm "${_IMPORT_PREFIX}/MacOS/libtrelis_lm.dylib" ) - -# Import target "clarofw" for configuration "Release" -set_property(TARGET clarofw APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(clarofw PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "trelis_lm;Qt5::Gui;Qt5::Core;cubit_python" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libclarofw.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libclarofw.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS clarofw ) -list(APPEND _IMPORT_CHECK_FILES_FOR_clarofw "${_IMPORT_PREFIX}/MacOS/libclarofw.dylib" ) - -# Import target "navigation" for configuration "Release" -set_property(TARGET navigation APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(navigation PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Widgets" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libnavigation.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libnavigation.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS navigation ) -list(APPEND _IMPORT_CHECK_FILES_FOR_navigation "${_IMPORT_PREFIX}/MacOS/libnavigation.dylib" ) - -# Import target "clarogui" for configuration "Release" -set_property(TARGET clarogui APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(clarogui PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "clarofw;navigation;Qt5::Core;Qt5::Widgets;cubit_python" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libclarogui.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libclarogui.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS clarogui ) -list(APPEND _IMPORT_CHECK_FILES_FOR_clarogui "${_IMPORT_PREFIX}/MacOS/libclarogui.dylib" ) - -# Import target "gtcAttrib" for configuration "Release" -set_property(TARGET gtcAttrib APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(gtcAttrib PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "SpaACIS" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libgtcAttrib.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libgtcAttrib.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS gtcAttrib ) -list(APPEND _IMPORT_CHECK_FILES_FOR_gtcAttrib "${_IMPORT_PREFIX}/MacOS/libgtcAttrib.dylib" ) - -# Import target "cubit_sizing_source" for configuration "Release" -set_property(TARGET cubit_sizing_source APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(cubit_sizing_source PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "cubit_util" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_sizing_source.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libcubit_sizing_source.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS cubit_sizing_source ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_sizing_source "${_IMPORT_PREFIX}/MacOS/libcubit_sizing_source.dylib" ) - -# Import target "cubit_mdb" for configuration "Release" -set_property(TARGET cubit_mdb APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(cubit_mdb PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_mdb.a" - ) - -list(APPEND _IMPORT_CHECK_TARGETS cubit_mdb ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_mdb "${_IMPORT_PREFIX}/MacOS/libcubit_mdb.a" ) - -# Import target "cubit_sim" for configuration "Release" -set_property(TARGET cubit_sim APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(cubit_sim PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_sim.a" - ) - -list(APPEND _IMPORT_CHECK_TARGETS cubit_sim ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_sim "${_IMPORT_PREFIX}/MacOS/libcubit_sim.a" ) - -# Import target "material_commands" for configuration "Release" -set_property(TARGET material_commands APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(material_commands PROPERTIES - IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/plugins/libmaterial_commands.so" - IMPORTED_NO_SONAME_RELEASE "TRUE" - ) - -list(APPEND _IMPORT_CHECK_TARGETS material_commands ) -list(APPEND _IMPORT_CHECK_FILES_FOR_material_commands "${_IMPORT_PREFIX}/MacOS/plugins/libmaterial_commands.so" ) - -# Import target "cubit_parsing_core" for configuration "Release" -set_property(TARGET cubit_parsing_core APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(cubit_parsing_core PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_parsing_core.a" - ) - -list(APPEND _IMPORT_CHECK_TARGETS cubit_parsing_core ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_parsing_core "${_IMPORT_PREFIX}/MacOS/libcubit_parsing_core.a" ) - -# Import target "cubiti" for configuration "Release" -set_property(TARGET cubiti APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(cubiti PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "trelis_lm;cubit_sizing_source;showviz_cubit;showviz_sim;showviz_mesh;showviz_base;cubit_smd;gtcAttrib;SpaACIS;cubit_geom;mg_tetra_hpc;mg_adapt;mg_tetra;mg_surfopt;mg_cadsurf;meshgems;meshgems_stubs;Qt5::Core" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubiti19.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libcubiti19.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS cubiti ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubiti "${_IMPORT_PREFIX}/MacOS/libcubiti19.dylib" ) - -# Import target "cubit_python" for configuration "Release" -set_property(TARGET cubit_python APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(cubit_python PROPERTIES - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libcubit_python.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libcubit_python.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS cubit_python ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python "${_IMPORT_PREFIX}/MacOS/libcubit_python.dylib" ) - -# Import target "cubit_python3" for configuration "Release" -set_property(TARGET cubit_python3 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(cubit_python3 PROPERTIES - IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/python3/libcubit_python3.so" - IMPORTED_NO_SONAME_RELEASE "TRUE" - ) - -list(APPEND _IMPORT_CHECK_TARGETS cubit_python3 ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python3 "${_IMPORT_PREFIX}/MacOS/python3/libcubit_python3.so" ) - -# Import target "cubit_python2" for configuration "Release" -set_property(TARGET cubit_python2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(cubit_python2 PROPERTIES - IMPORTED_COMMON_LANGUAGE_RUNTIME_RELEASE "" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/python2/libcubit_python2.so" - IMPORTED_NO_SONAME_RELEASE "TRUE" - ) - -list(APPEND _IMPORT_CHECK_TARGETS cubit_python2 ) -list(APPEND _IMPORT_CHECK_FILES_FOR_cubit_python2 "${_IMPORT_PREFIX}/MacOS/python2/libcubit_python2.so" ) - -# Import target "treemodel" for configuration "Release" -set_property(TARGET treemodel APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(treemodel PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "cubiti;Qt5::Core" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libtreemodel.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libtreemodel.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS treemodel ) -list(APPEND _IMPORT_CHECK_FILES_FOR_treemodel "${_IMPORT_PREFIX}/MacOS/libtreemodel.dylib" ) - -# Import target "pickwidget" for configuration "Release" -set_property(TARGET pickwidget APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(pickwidget PROPERTIES - IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "Qt5::Widgets" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/MacOS/libpickwidget.dylib" - IMPORTED_SONAME_RELEASE "@rpath/libpickwidget.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS pickwidget ) -list(APPEND _IMPORT_CHECK_FILES_FOR_pickwidget "${_IMPORT_PREFIX}/MacOS/libpickwidget.dylib" ) - -# Commands beyond this point should not need to know the version. -set(CMAKE_IMPORT_FILE_VERSION) diff --git a/script/build_plugin_macos.sh b/script/build_plugin_macos.sh deleted file mode 100755 index 11c4f5232..000000000 --- a/script/build_plugin_macos.sh +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -#Getting Macport -#curl https://distfiles.macports.org/MacPorts/MacPorts-2.6.3-10.15-Catalina.pkg --output MacPorts-2.6.3-10.15-Catalina.pkg -#sudo installer -pkg MacPorts-2.6.3-10.15-Catalina.pkg -target / -#rm -rf MacPorts-2.6.3-10.15-Catalina.pkg - -export PATH=/opt/local/bin:/opt/local/sbin:$PATH -export MANPATH=/opt/local/share/man:$MANPATH -export LD_LIBRARY_PATH=/opt/local/lib:$LD_LIBRARY_PATH - - -#sudo port -N selfupdate -#sudo port -N install libtool eigen3 hdf5 cmake gcc6 wget realpath - -#wget https://github.com/fxcoudert/gfortran-for-macOS/releases/download/10.2/gfortran-10.2-Catalina.dmg -#hdiutil attach gfortran-10.2-Catalina.dmg -#sudo installer -pkg /Volumes/gfortran-10.2-Catalina/gfortran.pkg -target / -#hdiutil detach /Volumes/gfortran-10.2-Catalina - - -cd - -# Setup -CURRENT=$(pwd) -SCRIPTPATH=`dirname $(dirname $(realpath $0))` - -PLUGIN_DIR="plugin-build" -mkdir ${PLUGIN_DIR} -hdiutil attach -quiet -nobrowse -noverify -noautoopen SDK/Trelis-17.1.0-Mac64.dmg -rm -rf /Applications/Trelis-17.1.app -cp -rf /Volumes/Trelis-17.1.0-Mac64/Trelis-17.1.app /Applications/ -hdiutil detach /Volumes/Trelis-17.1.0-Mac64 - -PLUGIN_ABS_PATH=${CURRENT}/${PLUGIN_DIR} - -echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" - -unset LD_LIBRARY_PATH - -cd ${PLUGIN_ABS_PATH} -ln -s $SCRIPTPATH/ ./ - -mkdir -pv moab/bld -cd moab -git clone https://bitbucket.org/fathomteam/moab -b Version5.1.0 -cd bld -cmake ../moab -DENABLE_HDF5=ON \ - -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_BLASLAPACK=OFF -DENABLE_FORTRAN=OFF \ - -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ - -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/moab -make -j -make install - -cd ${PLUGIN_ABS_PATH} -mkdir -pv DAGMC/bld -cd DAGMC -git clone https://github.com/bam241/DAGMC -b build_exe -cd bld -cmake ../DAGMC -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ - -DMOAB_DIR=${PLUGIN_ABS_PATH}/moab \ - -DBUILD_UWUW=ON \ - -DBUILD_TALLY=OFF \ - -DBUILD_BUILD_OBB=OFF \ - -DBUILD_MAKE_WATERTIGHT=ON \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_STATIC_LIBS=ON \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/DAGMC -make -j -make install - -cd -TRELIS_INSTALL_LOC="/Applications/Trelis-17.1.app/Contents" -cd $TRELIS_INSTALL_LOC -tar -xzf /Users/mouginot/SDK/Trelis-SDK-17.1.0-Mac64.tar -mv Trelis-17.1/* ./ -cp -f Trelis-17.1.app/Contents/MacOS/* MacOS/ -cp -f bin/* MacOS/ -rm -rf bin Trelis-17.1.app -ln -s MacOS bin -#cd bin -#sudo cp -pv CubitExport-Release.cmake CubitExport-Release.cmake.orig -#sudo port install gsed -#sudo gsed -i "s/\"Trelis-17.1.app\/Contents/\MacOS\"/\"bin\"/" CubitExport-Release.cmake -cd - -cd ${PLUGIN_ABS_PATH}/Trelis-plugin -git submodule update --init - -cd ${PLUGIN_ABS_PATH}/Trelis-plugin -cp script/CubitExport-release.cmake ${TRELIS_INSTALL_LOC}/MacOS/ -rm -rf bld -mkdir -pv bld -cd bld -cmake .. -DCubit_DIR=${TRELIS_INSTALL_LOC}/MacOS \ - -DCUBIT_ROOT=${TRELIS_INSTALL_LOC}/MacOS \ - -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH} -make -j -make install - - -# -DCMAKE_BUILD_TYPE=Release \ - - - -cd ${PLUGIN_ABS_PATH} -mkdir -p pack/MacOS/plugins/svalinn -cd pack/MacOS/plugins/svalinn - -# Copy all needed libraries into current directory -cp -pPv ${PLUGIN_ABS_PATH}/lib/* . - -# Create the Svalinn plugin tarball -cd .. -ln -sv svalinn/libsvalinn_plugin.so . -cd ../.. -tar -czvf svalinn-plugin_mac.tgz MacOS -mv -v svalinn-plugin_mac.tgz ~/ -cd .. -# rm -rf pack bld DAGMC lib moab -# rm Trelis-plugin From fa6a506664976b2b55cbbf1dd0b02db0e2cb8ee5 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 11 Feb 2021 15:28:19 -0600 Subject: [PATCH 54/76] cleaning artifacts --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 448c6be17..a62f41737 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,10 +54,6 @@ message(STATUS "CMAKE_INSTALL_RPATH: ${CMAKE_INSTALL_RPATH}") # based on which build options are enabled set(PLUGIN_SRC_FILES SvalinnPlugin.cpp) set(PLUGIN_LINK_LIBS ${CUBIT_LIBS}) -SET(HDF5_USE_STATIC_LIBRARIES ON) -find_package(HDF5 REQUIRED) -include_directories(${HDF5_INCLUDE_DIRS}) -list(APPEND PLUGIN_LINK_LIBS ${HDF5_LIBRARIES}) # DAGMC exporter if (BUILD_DAGMC_EXPORTER) message(STATUS "Building DAGMC exporter") @@ -132,5 +128,5 @@ message(STATUS "Building Svalinn plugin") message(STATUS "PLUGIN_SRC_FILES: ${PLUGIN_SRC_FILES}") message(STATUS "PLUGIN_LINK_LIBS: ${PLUGIN_LINK_LIBS}") add_library(svalinn_plugin MODULE ${PLUGIN_SRC_FILES}) -target_link_libraries(svalinn_plugin PUBLIC ${PLUGIN_LINK_LIBS}) +target_link_libraries(svalinn_plugin ${PLUGIN_LINK_LIBS}) install(TARGETS svalinn_plugin LIBRARY DESTINATION lib) From ac1ff2b546cf3a8f26071b5111cbbfc8d84e3b0f Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 11 Feb 2021 15:28:56 -0600 Subject: [PATCH 55/76] cleaning artifacts --- CMakeLists.txt | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a62f41737..7a4dfb690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,11 +3,10 @@ project(SvalinnCommandPlugin) cmake_minimum_required(VERSION 3.0) # Build options -option(UPDATE_SUBMODULES "Automatically update git submodules" ON) -option(BUILD_DAGMC_EXPORTER "Include DagMC export capability" ON) -option(BUILD_MCNP_IMPORTER "Include MCNP import capability" ON) -option(BUILD_IGEOM "Build iGeom library" ON) -option(BUILD_IGEOM_TESTS "Include tests for iGeom" ON) +option(BUILD_DAGMC_EXPORTER "Include DagMC export capability" ON) +option(BUILD_MCNP_IMPORTER "Include MCNP import capability" ON) +option(BUILD_IGEOM "Build iGeom library" ON) +option(BUILD_IGEOM_TESTS "Include tests for iGeom" ON) # MCNP importer and iGeom tests require iGeom if (BUILD_MCNP_IMPORTER OR BUILD_IGEOM_TESTS) @@ -20,6 +19,12 @@ if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif () +if(MSVC) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + set(BUILD_SHARED_LIBS TRUE) +endif() + + # Use C++11 set(CMAKE_CXX_STANDARD 11) @@ -33,9 +38,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux AND CMAKE_COMPILER_IS_GNUCXX) endif () # Find Cubit/Trelis -if (NOT CUBIT_ROOT) - message(FATAL_ERROR "CUBIT_ROOT not specified") -endif () list(APPEND CMAKE_PREFIX_PATH ${CUBIT_ROOT}/bin) find_package(Cubit REQUIRED CONFIG) include_directories(${CUBIT_INCLUDE_DIRS}) @@ -54,6 +56,7 @@ message(STATUS "CMAKE_INSTALL_RPATH: ${CMAKE_INSTALL_RPATH}") # based on which build options are enabled set(PLUGIN_SRC_FILES SvalinnPlugin.cpp) set(PLUGIN_LINK_LIBS ${CUBIT_LIBS}) + # DAGMC exporter if (BUILD_DAGMC_EXPORTER) message(STATUS "Building DAGMC exporter") @@ -92,32 +95,11 @@ endif () # MCNP importer if (BUILD_MCNP_IMPORTER) - # Update mcnp2cad submodule as neeeded - if (UPDATE_SUBMODULES) - find_package(Git) - if (GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") - message(STATUS "Updating mcnp2cad submodule") - execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE GIT_SUBMOD_RESULT) - if (NOT GIT_SUBMOD_RESULT EQUAL 0) - message(FATAL_ERROR "git submodule update --init failed with \ - ${GIT_SUBMOD_RESULT}, please checkout submodules") - endif () - endif () - endif () - message(STATUS "Building MCNP importer") add_definitions(-DBUILD_MCNP_IMPORT=ON) set(STANDALONE_MCNP2CAD OFF CACHE BOOL "") set(BUILD_MCNP2CAD_TESTS OFF CACHE BOOL "") - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/mcnp2cad/CMakeLists.txt) - add_subdirectory(mcnp2cad) - else () - message(FATAL_ERROR "mcnp2cad submodule not found.\n" - "Run \"git submodule update --init --recursive\" " - "to pull the mcnp2cad submodule.") - endif () + add_subdirectory(mcnp2cad) include_directories(mcnp2cad) list(APPEND PLUGIN_SRC_FILES import_mcnp_cmd/MCNPImp.cpp) list(APPEND PLUGIN_LINK_LIBS mcnp2cad) From 86e84c5b473a899fc818a278f5859266f336173c Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 11 Feb 2021 15:29:29 -0600 Subject: [PATCH 56/76] cleaning artifacts --- CMakeLists.txt | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a4dfb690..621e98e60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,11 @@ project(SvalinnCommandPlugin) cmake_minimum_required(VERSION 3.0) # Build options -option(BUILD_DAGMC_EXPORTER "Include DagMC export capability" ON) -option(BUILD_MCNP_IMPORTER "Include MCNP import capability" ON) -option(BUILD_IGEOM "Build iGeom library" ON) -option(BUILD_IGEOM_TESTS "Include tests for iGeom" ON) +option(UPDATE_SUBMODULES "Automatically update git submodules" ON) +option(BUILD_DAGMC_EXPORTER "Include DagMC export capability" ON) +option(BUILD_MCNP_IMPORTER "Include MCNP import capability" ON) +option(BUILD_IGEOM "Build iGeom library" ON) +option(BUILD_IGEOM_TESTS "Include tests for iGeom" ON) # MCNP importer and iGeom tests require iGeom if (BUILD_MCNP_IMPORTER OR BUILD_IGEOM_TESTS) @@ -38,6 +39,9 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux AND CMAKE_COMPILER_IS_GNUCXX) endif () # Find Cubit/Trelis +if (NOT CUBIT_ROOT) + message(FATAL_ERROR "CUBIT_ROOT not specified") +endif () list(APPEND CMAKE_PREFIX_PATH ${CUBIT_ROOT}/bin) find_package(Cubit REQUIRED CONFIG) include_directories(${CUBIT_INCLUDE_DIRS}) @@ -95,11 +99,32 @@ endif () # MCNP importer if (BUILD_MCNP_IMPORTER) + # Update mcnp2cad submodule as neeeded + if (UPDATE_SUBMODULES) + find_package(Git) + if (GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") + message(STATUS "Updating mcnp2cad submodule") + execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE GIT_SUBMOD_RESULT) + if (NOT GIT_SUBMOD_RESULT EQUAL 0) + message(FATAL_ERROR "git submodule update --init failed with \ + ${GIT_SUBMOD_RESULT}, please checkout submodules") + endif () + endif () + endif () + message(STATUS "Building MCNP importer") add_definitions(-DBUILD_MCNP_IMPORT=ON) set(STANDALONE_MCNP2CAD OFF CACHE BOOL "") set(BUILD_MCNP2CAD_TESTS OFF CACHE BOOL "") - add_subdirectory(mcnp2cad) + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/mcnp2cad/CMakeLists.txt) + add_subdirectory(mcnp2cad) + else () + message(FATAL_ERROR "mcnp2cad submodule not found.\n" + "Run \"git submodule update --init --recursive\" " + "to pull the mcnp2cad submodule.") + endif () include_directories(mcnp2cad) list(APPEND PLUGIN_SRC_FILES import_mcnp_cmd/MCNPImp.cpp) list(APPEND PLUGIN_LINK_LIBS mcnp2cad) From 0a1c36bd8e9917bf742e73861b636f8d73dbc59f Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 11 Feb 2021 15:30:03 -0600 Subject: [PATCH 57/76] this should be it... --- CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 621e98e60..1fd7d91f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,12 +20,6 @@ if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif () -if(MSVC) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) - set(BUILD_SHARED_LIBS TRUE) -endif() - - # Use C++11 set(CMAKE_CXX_STANDARD 11) From f7db14b76ac01f210ad3cc008b4f7cd3d28087b0 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Thu, 11 Feb 2021 17:18:40 -0600 Subject: [PATCH 58/76] Update script/linux_share_build.sh Co-authored-by: Paul Wilson --- script/linux_share_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/linux_share_build.sh b/script/linux_share_build.sh index 912014cdf..d5c86c11e 100644 --- a/script/linux_share_build.sh +++ b/script/linux_share_build.sh @@ -2,7 +2,7 @@ -function install_prerequise() { +function install_prerequisites() { TZ=America/Chicago ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone apt-get update -y @@ -118,4 +118,4 @@ function build_plugin_pkg(){ ln -sv svalinn/libsvalinn_plugin.so . cd ../.. tar --sort=name -czvf svalinn-plugin_linux_$1.tgz bin -} \ No newline at end of file +} From ef5d3ea5a3960616d5f9a5cc69904587db6ac214 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 11 Feb 2021 17:22:21 -0600 Subject: [PATCH 59/76] update according to @gonuke comments --- script/build_plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build_plugin.sh b/script/build_plugin.sh index a12084157..08cf66cd3 100755 --- a/script/build_plugin.sh +++ b/script/build_plugin.sh @@ -7,7 +7,7 @@ PLUGIN_ABS_PATH="" source ${SCRIPTPATH}/script/linux_share_build.sh -install_prerequise +install_prerequisites setup_folder From 296a66bdfc161305116f6a3d2ee261b9b4f63eba Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 11 Feb 2021 17:38:18 -0600 Subject: [PATCH 60/76] ckeaning --- script/linux_share_build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/script/linux_share_build.sh b/script/linux_share_build.sh index d5c86c11e..e05f5e968 100644 --- a/script/linux_share_build.sh +++ b/script/linux_share_build.sh @@ -72,8 +72,6 @@ function setup_Trelis_sdk() { cd /opt tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz - cd /opt/Trelis-16.5 - tar -xzvf /Trelis-sdk/Trelis-SDK-$1-Lin64.tar.gz } function build_plugin(){ From abce1a29a2f8e45345cca3cde190a1abf3e4a80f Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 11 Feb 2021 17:41:26 -0600 Subject: [PATCH 61/76] reset mcnp_cad commit --- mcnp2cad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcnp2cad b/mcnp2cad index 1fe2038b6..595874c5f 160000 --- a/mcnp2cad +++ b/mcnp2cad @@ -1 +1 @@ -Subproject commit 1fe2038b614b1b496310fb1d047636ce038c86b3 +Subproject commit 595874c5f0bad376c385d2cf57c278cf912c8f5b From 6e3a63fa24440b1498c14cc9906da5ffb129e36c Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Fri, 12 Feb 2021 09:11:59 -0600 Subject: [PATCH 62/76] @gonuke waS right libtool is not required --- script/linux_share_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/linux_share_build.sh b/script/linux_share_build.sh index e05f5e968..5d21b016c 100644 --- a/script/linux_share_build.sh +++ b/script/linux_share_build.sh @@ -6,7 +6,7 @@ function install_prerequisites() { TZ=America/Chicago ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone apt-get update -y - apt-get install -y g++ libtool libeigen3-dev libhdf5-dev patchelf git cmake + apt-get install -y g++ libeigen3-dev libhdf5-dev patchelf git cmake } function setup_folder() { From a8b7d00a879a00d7710995742939f78684ce5882 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 15 Feb 2021 10:24:30 -0600 Subject: [PATCH 63/76] Apply suggestions from code review Co-authored-by: Patrick Shriwise --- script/linux_share_build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/script/linux_share_build.sh b/script/linux_share_build.sh index 5d21b016c..f1b953dd4 100644 --- a/script/linux_share_build.sh +++ b/script/linux_share_build.sh @@ -1,7 +1,5 @@ #!/bin/bash - - function install_prerequisites() { TZ=America/Chicago ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -63,7 +61,7 @@ function build_dagmc(){ make -j`grep -c processor /proc/cpuinfo` make install cd ../.. - rm -rf DAGMC/DAGMC DAGCM/bld + rm -rf DAGMC/DAGMC DAGMC/bld } function setup_Trelis_sdk() { From f01e71d5eb441c0f6be3fb4fddcefa92f682c9d9 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 15 Feb 2021 10:30:17 -0600 Subject: [PATCH 64/76] few changes addressing @pat suggestion --- {script => scripts}/build_plug_linux.sh | 0 {script => scripts}/build_plugin.sh | 3 +++ {script => scripts}/linux_share_build.sh | 10 +++++----- 3 files changed, 8 insertions(+), 5 deletions(-) rename {script => scripts}/build_plug_linux.sh (100%) rename {script => scripts}/build_plugin.sh (81%) rename {script => scripts}/linux_share_build.sh (94%) diff --git a/script/build_plug_linux.sh b/scripts/build_plug_linux.sh similarity index 100% rename from script/build_plug_linux.sh rename to scripts/build_plug_linux.sh diff --git a/script/build_plugin.sh b/scripts/build_plugin.sh similarity index 81% rename from script/build_plugin.sh rename to scripts/build_plugin.sh index 08cf66cd3..cb958e9c4 100755 --- a/script/build_plugin.sh +++ b/scripts/build_plugin.sh @@ -1,4 +1,6 @@ #!/bin/bash +set -ex + CURRENT=$(pwd) SCRIPTPATH=`dirname $(dirname $(realpath $0))` @@ -14,6 +16,7 @@ setup_folder build_moab build_dagmc +# $1 is the version of Trelis/Cubit one are trying to compile against i.e. 17.1.0 setup_Trelis_sdk $1 build_plugin $1 build_plugin_pkg $1 diff --git a/script/linux_share_build.sh b/scripts/linux_share_build.sh similarity index 94% rename from script/linux_share_build.sh rename to scripts/linux_share_build.sh index 5d21b016c..77c5245c0 100644 --- a/script/linux_share_build.sh +++ b/scripts/linux_share_build.sh @@ -1,5 +1,5 @@ #!/bin/bash - +PROC=$((`grep -c processor /proc/cpuinfo`)) function install_prerequisites() { @@ -35,7 +35,7 @@ function build_moab() { -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/moab - make -j`grep -c processor /proc/cpuinfo` + make -j$PROC make install cd ../.. rm -rf moab/moab moab/bld @@ -46,7 +46,7 @@ function build_dagmc(){ cd ${PLUGIN_ABS_PATH} mkdir -pv DAGMC/bld cd DAGMC - git clone https://github.com/bam241/DAGMC -b build_exe + git clone https://github.com/svalinn/DAGMC -b develop cd bld cmake ../DAGMC -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 \ -DMOAB_DIR=${PLUGIN_ABS_PATH}/moab \ @@ -60,7 +60,7 @@ function build_dagmc(){ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH}/DAGMC - make -j`grep -c processor /proc/cpuinfo` + make -j$PROC make install cd ../.. rm -rf DAGMC/DAGMC DAGCM/bld @@ -85,7 +85,7 @@ function build_plugin(){ -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${PLUGIN_ABS_PATH} - make -j`grep -c processor /proc/cpuinfo` + make -j$PROC make install } From ea8bb9e86eb348f789aa3b596bbbada9fe7ea8b5 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 16 Feb 2021 08:51:02 -0600 Subject: [PATCH 65/76] adding readme --- scripts/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 scripts/README.md diff --git a/scripts/README.md b/scripts/README.md new file mode 100644 index 000000000..3fe678a8f --- /dev/null +++ b/scripts/README.md @@ -0,0 +1,9 @@ +SVALINN PLUGIN SCRIPTS +====================== + +This folder contains scripts to build the Svalinn plugin for multiple platform. + +Linux (tested on Ubuntu 18.04 and 20.04): +----------------------------------------- + +- `linux_share_build.sh`: From e8ece151ca7d9f9d1cdbe44bd87c3c98c6e1a4cc Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 13:39:07 -0600 Subject: [PATCH 66/76] adding readme --- scripts/README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/README.md b/scripts/README.md index 3fe678a8f..b8549864d 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -6,4 +6,11 @@ This folder contains scripts to build the Svalinn plugin for multiple platform. Linux (tested on Ubuntu 18.04 and 20.04): ----------------------------------------- -- `linux_share_build.sh`: +- `linux_share_build.sh`: contains multiple methods allowing to setup and build the required dependencies as well as the plugin + - `install_prerequisites()`: apt-get install system dependencies + - `setup_folder()`: build the fodler layout required to plugin build + - `build_moab()`: build and install MOAB + - `build_dagmc()`: build and install DAGMC + - `setup_Trelis_sdk()`: install Trelis/CUbit and the corresponding SDK + - `build_plugin()`: build the plugin + - `build_plugin_pkg()`: build a tarball containing the plugin \ No newline at end of file From 51a10b3d316cfdd6ee9b2b0a89cbd7bc23d36d00 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 13:40:13 -0600 Subject: [PATCH 67/76] renaming files --- scripts/{build_plug_linux.sh => build_plugin_docker_ubuntu.sh} | 0 scripts/{build_plugin.sh => build_plugin_linux.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename scripts/{build_plug_linux.sh => build_plugin_docker_ubuntu.sh} (100%) rename scripts/{build_plugin.sh => build_plugin_linux.sh} (100%) diff --git a/scripts/build_plug_linux.sh b/scripts/build_plugin_docker_ubuntu.sh similarity index 100% rename from scripts/build_plug_linux.sh rename to scripts/build_plugin_docker_ubuntu.sh diff --git a/scripts/build_plugin.sh b/scripts/build_plugin_linux.sh similarity index 100% rename from scripts/build_plugin.sh rename to scripts/build_plugin_linux.sh From 6e851e1f5b9b95a157641a296e1a4c678cd3ed61 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 13:45:39 -0600 Subject: [PATCH 68/76] upate docs --- scripts/README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/README.md b/scripts/README.md index b8549864d..356db7ef3 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -13,4 +13,12 @@ Linux (tested on Ubuntu 18.04 and 20.04): - `build_dagmc()`: build and install DAGMC - `setup_Trelis_sdk()`: install Trelis/CUbit and the corresponding SDK - `build_plugin()`: build the plugin - - `build_plugin_pkg()`: build a tarball containing the plugin \ No newline at end of file + - `build_plugin_pkg()`: build a tarball containing the plugin + +- `build_plugin_linux.sh`: build the plugin on a linux computer (relies on apt-get to install required dependencies) + - arguments: Trelis/CUbit version to build the plugin for (only supported yet `17.1.0`) +- `build_plugin_docker_ubuntu.sh`: build the plugin in a docker container + - arguments: Arguments have to be provided in order + - docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) + - local path to the folder containing the Trelis/Cubit install deb and SDK + - version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) From c45e9bd67bfc797062b7ca4354e3511afa60f8e7 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 13:46:41 -0600 Subject: [PATCH 69/76] ordering args --- scripts/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 356db7ef3..93c8d0089 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -19,6 +19,6 @@ Linux (tested on Ubuntu 18.04 and 20.04): - arguments: Trelis/CUbit version to build the plugin for (only supported yet `17.1.0`) - `build_plugin_docker_ubuntu.sh`: build the plugin in a docker container - arguments: Arguments have to be provided in order - - docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) - - local path to the folder containing the Trelis/Cubit install deb and SDK - - version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) + #1 docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) + #2 local path to the folder containing the Trelis/Cubit install deb and SDK + #3 version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) From e49082897b2079938c10c8e2d28e0bfdd2a50bb9 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 13:47:08 -0600 Subject: [PATCH 70/76] fixing syntax --- scripts/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 93c8d0089..38f144a67 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -19,6 +19,6 @@ Linux (tested on Ubuntu 18.04 and 20.04): - arguments: Trelis/CUbit version to build the plugin for (only supported yet `17.1.0`) - `build_plugin_docker_ubuntu.sh`: build the plugin in a docker container - arguments: Arguments have to be provided in order - #1 docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) - #2 local path to the folder containing the Trelis/Cubit install deb and SDK - #3 version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) + -1 docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) + -2 local path to the folder containing the Trelis/Cubit install deb and SDK + -3 version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) From 7246373897a1cf79c7186755285b07ec27d9362b Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 13:47:43 -0600 Subject: [PATCH 71/76] better syntax --- scripts/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 38f144a67..41250bf77 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -19,6 +19,6 @@ Linux (tested on Ubuntu 18.04 and 20.04): - arguments: Trelis/CUbit version to build the plugin for (only supported yet `17.1.0`) - `build_plugin_docker_ubuntu.sh`: build the plugin in a docker container - arguments: Arguments have to be provided in order - -1 docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) - -2 local path to the folder containing the Trelis/Cubit install deb and SDK - -3 version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) + 1. docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) + 2. local path to the folder containing the Trelis/Cubit install deb and SDK + 3. version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) From 9e0cf2a65cc270a9c389b4d9d77d593c38b4b72e Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 13:48:13 -0600 Subject: [PATCH 72/76] with actual number ? --- scripts/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 41250bf77..002861901 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -19,6 +19,6 @@ Linux (tested on Ubuntu 18.04 and 20.04): - arguments: Trelis/CUbit version to build the plugin for (only supported yet `17.1.0`) - `build_plugin_docker_ubuntu.sh`: build the plugin in a docker container - arguments: Arguments have to be provided in order - 1. docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) - 2. local path to the folder containing the Trelis/Cubit install deb and SDK - 3. version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) + - 1. docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) + - 2. local path to the folder containing the Trelis/Cubit install deb and SDK + - 3. version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) From 2d707d655ed856a1d0cafc13be4d0a2df34ebd34 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 13:48:30 -0600 Subject: [PATCH 73/76] with actual number ? --- scripts/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 002861901..03828f3df 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -19,6 +19,6 @@ Linux (tested on Ubuntu 18.04 and 20.04): - arguments: Trelis/CUbit version to build the plugin for (only supported yet `17.1.0`) - `build_plugin_docker_ubuntu.sh`: build the plugin in a docker container - arguments: Arguments have to be provided in order - - 1. docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) - - 2. local path to the folder containing the Trelis/Cubit install deb and SDK - - 3. version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) + - 1 docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) + - 2 local path to the folder containing the Trelis/Cubit install deb and SDK + - 3 version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) From d3b64a903b4125bb726d6f8888fee57b9cbe8159 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 15:46:18 -0600 Subject: [PATCH 74/76] fix typo --- scripts/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/README.md b/scripts/README.md index 03828f3df..0064e956e 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -8,7 +8,7 @@ Linux (tested on Ubuntu 18.04 and 20.04): - `linux_share_build.sh`: contains multiple methods allowing to setup and build the required dependencies as well as the plugin - `install_prerequisites()`: apt-get install system dependencies - - `setup_folder()`: build the fodler layout required to plugin build + - `setup_folder()`: build the folder layout required to plugin build - `build_moab()`: build and install MOAB - `build_dagmc()`: build and install DAGMC - `setup_Trelis_sdk()`: install Trelis/CUbit and the corresponding SDK From f92ab4887f4cabddda0d271159168ac0da83821f Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Wed, 17 Feb 2021 15:48:36 -0600 Subject: [PATCH 75/76] moving the unset LD to other script --- scripts/build_plugin_linux.sh | 3 +++ scripts/linux_share_build.sh | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build_plugin_linux.sh b/scripts/build_plugin_linux.sh index cb958e9c4..4858e93bc 100755 --- a/scripts/build_plugin_linux.sh +++ b/scripts/build_plugin_linux.sh @@ -7,6 +7,9 @@ SCRIPTPATH=`dirname $(dirname $(realpath $0))` PLUGIN_DIR="plugin-build" PLUGIN_ABS_PATH="" +#need to clear the LD_LIBRARY_PATH to avoid lib conflict +unset LD_LIBRARY_PATH + source ${SCRIPTPATH}/script/linux_share_build.sh install_prerequisites diff --git a/scripts/linux_share_build.sh b/scripts/linux_share_build.sh index bb6a590ae..da35116dc 100644 --- a/scripts/linux_share_build.sh +++ b/scripts/linux_share_build.sh @@ -13,8 +13,6 @@ function setup_folder() { mkdir ${PLUGIN_DIR} echo "Building the Trelis plugin in ${CURRENT}\\${PLUGIN_DIR}" - unset LD_LIBRARY_PATH - cd ${PLUGIN_DIR} PLUGIN_ABS_PATH=$(pwd) ln -s $SCRIPTPATH/ ./ From 5f83026894cb9df63be7f91a4ea441c11d1a3377 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Tue, 23 Feb 2021 11:44:09 -0600 Subject: [PATCH 76/76] Apply suggestions from code review Co-authored-by: Patrick Shriwise --- scripts/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 0064e956e..837dd7f82 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -1,7 +1,7 @@ SVALINN PLUGIN SCRIPTS ====================== -This folder contains scripts to build the Svalinn plugin for multiple platform. +This folder contains scripts to build the Svalinn plugin on multiple platforms. Linux (tested on Ubuntu 18.04 and 20.04): ----------------------------------------- @@ -13,12 +13,12 @@ Linux (tested on Ubuntu 18.04 and 20.04): - `build_dagmc()`: build and install DAGMC - `setup_Trelis_sdk()`: install Trelis/CUbit and the corresponding SDK - `build_plugin()`: build the plugin - - `build_plugin_pkg()`: build a tarball containing the plugin + - `build_plugin_pkg()`: build a tarball containing the plugin - `build_plugin_linux.sh`: build the plugin on a linux computer (relies on apt-get to install required dependencies) - - arguments: Trelis/CUbit version to build the plugin for (only supported yet `17.1.0`) + - arguments: Trelis/Cubit version to build the plugin for (only supported yet `17.1.0`) - `build_plugin_docker_ubuntu.sh`: build the plugin in a docker container - arguments: Arguments have to be provided in order - 1 docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`) - 2 local path to the folder containing the Trelis/Cubit install deb and SDK - - 3 version of CUbit Trelis to build the plugin for (only supported yet `17.1.0`) + - 3 version of Cubit Trelis to build the plugin for (only tested with `17.1.0`)