diff --git a/Finite-Element-Tests/CMakeLists.txt b/Finite-Element-Tests/CMakeLists.txt index 82278de..99b7a98 100644 --- a/Finite-Element-Tests/CMakeLists.txt +++ b/Finite-Element-Tests/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 2.8.11) -set (CMAKE_CXX_STANDARD 11) +set (CMAKE_CXX_STANDARD 14) project (Finite-Element-Tests) diff --git a/Finite-Element-Tests/tests/Demo3D/CMakeLists.txt b/Finite-Element-Tests/tests/Demo3D/CMakeLists.txt index a1531b8..7c6d61b 100644 --- a/Finite-Element-Tests/tests/Demo3D/CMakeLists.txt +++ b/Finite-Element-Tests/tests/Demo3D/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(Demo3D target_link_libraries( Demo3D - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/Demo3D/main.cpp b/Finite-Element-Tests/tests/Demo3D/main.cpp index 08c78be..e739a8d 100644 --- a/Finite-Element-Tests/tests/Demo3D/main.cpp +++ b/Finite-Element-Tests/tests/Demo3D/main.cpp @@ -1,3 +1,5 @@ +#include + #include "AnimatedTetrahedronMesh.h" #include diff --git a/Finite-Element-Tests/tests/MembranePinch1/CMakeLists.txt b/Finite-Element-Tests/tests/MembranePinch1/CMakeLists.txt index 0f54ea5..1b5ff9f 100644 --- a/Finite-Element-Tests/tests/MembranePinch1/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembranePinch1/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembranePinch1 target_link_libraries( MembranePinch1 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembranePinch2/CMakeLists.txt b/Finite-Element-Tests/tests/MembranePinch2/CMakeLists.txt index 4ff100c..c830764 100644 --- a/Finite-Element-Tests/tests/MembranePinch2/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembranePinch2/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembranePinch2 target_link_libraries( MembranePinch2 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembranePinch3/CMakeLists.txt b/Finite-Element-Tests/tests/MembranePinch3/CMakeLists.txt index 890bc22..c1317be 100644 --- a/Finite-Element-Tests/tests/MembranePinch3/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembranePinch3/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembranePinch3 target_link_libraries( MembranePinch3 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembranePinch4/CMakeLists.txt b/Finite-Element-Tests/tests/MembranePinch4/CMakeLists.txt index fb78abf..56ece57 100644 --- a/Finite-Element-Tests/tests/MembranePinch4/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembranePinch4/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembranePinch4 target_link_libraries( MembranePinch4 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembranePinch4/main.cpp b/Finite-Element-Tests/tests/MembranePinch4/main.cpp index 21d1031..e89882c 100644 --- a/Finite-Element-Tests/tests/MembranePinch4/main.cpp +++ b/Finite-Element-Tests/tests/MembranePinch4/main.cpp @@ -1,3 +1,5 @@ +#include + #include "FiniteElementMesh.h" #include diff --git a/Finite-Element-Tests/tests/MembranePinch5/CMakeLists.txt b/Finite-Element-Tests/tests/MembranePinch5/CMakeLists.txt index c52dc2e..1422b5c 100644 --- a/Finite-Element-Tests/tests/MembranePinch5/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembranePinch5/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembranePinch5 target_link_libraries( MembranePinch5 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembranePinch5/main.cpp b/Finite-Element-Tests/tests/MembranePinch5/main.cpp index 95545cc..50c5b72 100644 --- a/Finite-Element-Tests/tests/MembranePinch5/main.cpp +++ b/Finite-Element-Tests/tests/MembranePinch5/main.cpp @@ -1,3 +1,5 @@ +#include + #include "FiniteElementMesh.h" #include diff --git a/Finite-Element-Tests/tests/MembranePinch6/CMakeLists.txt b/Finite-Element-Tests/tests/MembranePinch6/CMakeLists.txt index 58c2206..de77277 100644 --- a/Finite-Element-Tests/tests/MembranePinch6/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembranePinch6/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembranePinch6 target_link_libraries( MembranePinch6 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembranePinch6/main.cpp b/Finite-Element-Tests/tests/MembranePinch6/main.cpp index 5bd6cf0..28c5741 100644 --- a/Finite-Element-Tests/tests/MembranePinch6/main.cpp +++ b/Finite-Element-Tests/tests/MembranePinch6/main.cpp @@ -1,3 +1,5 @@ +#include + #include "FiniteElementMesh.h" #include diff --git a/Finite-Element-Tests/tests/MembraneStretch1/CMakeLists.txt b/Finite-Element-Tests/tests/MembraneStretch1/CMakeLists.txt index b91706b..2980364 100644 --- a/Finite-Element-Tests/tests/MembraneStretch1/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembraneStretch1/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembraneStretch1 target_link_libraries( MembraneStretch1 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembraneStretch1/main.cpp b/Finite-Element-Tests/tests/MembraneStretch1/main.cpp index 5b0885c..500160b 100644 --- a/Finite-Element-Tests/tests/MembraneStretch1/main.cpp +++ b/Finite-Element-Tests/tests/MembraneStretch1/main.cpp @@ -1,3 +1,5 @@ +#include + #include "FiniteElementMesh.h" #include diff --git a/Finite-Element-Tests/tests/MembraneStretch2/CMakeLists.txt b/Finite-Element-Tests/tests/MembraneStretch2/CMakeLists.txt index 7356af0..b69c5fa 100644 --- a/Finite-Element-Tests/tests/MembraneStretch2/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembraneStretch2/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembraneStretch2 target_link_libraries( MembraneStretch2 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembraneStretch2/main.cpp b/Finite-Element-Tests/tests/MembraneStretch2/main.cpp index 34598fd..4acf913 100644 --- a/Finite-Element-Tests/tests/MembraneStretch2/main.cpp +++ b/Finite-Element-Tests/tests/MembraneStretch2/main.cpp @@ -1,3 +1,5 @@ +#include + #include "FiniteElementMesh.h" #include diff --git a/Finite-Element-Tests/tests/MembraneStretch3/CMakeLists.txt b/Finite-Element-Tests/tests/MembraneStretch3/CMakeLists.txt index 68088b8..760fe20 100644 --- a/Finite-Element-Tests/tests/MembraneStretch3/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembraneStretch3/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembraneStretch3 target_link_libraries( MembraneStretch3 - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembraneStretch3/main.cpp b/Finite-Element-Tests/tests/MembraneStretch3/main.cpp index 441de1b..466f90d 100644 --- a/Finite-Element-Tests/tests/MembraneStretch3/main.cpp +++ b/Finite-Element-Tests/tests/MembraneStretch3/main.cpp @@ -1,3 +1,5 @@ +#include + #include "FiniteElementMesh.h" #include diff --git a/Finite-Element-Tests/tests/MembraneStretchPD/CMakeLists.txt b/Finite-Element-Tests/tests/MembraneStretchPD/CMakeLists.txt index b1f88a8..b26cd6b 100644 --- a/Finite-Element-Tests/tests/MembraneStretchPD/CMakeLists.txt +++ b/Finite-Element-Tests/tests/MembraneStretchPD/CMakeLists.txt @@ -15,10 +15,10 @@ target_include_directories(MembraneStretchPD target_link_libraries( MembraneStretchPD - ${USD_LIB_DIR}/libgf.so - ${USD_LIB_DIR}/libsdf.so - ${USD_LIB_DIR}/libtf.so - ${USD_LIB_DIR}/libusd.so - ${USD_LIB_DIR}/libusdGeom.so - ${USD_LIB_DIR}/libvt.so + ${USD_LIB_DIR}/libusd_gf.so + ${USD_LIB_DIR}/libusd_sdf.so + ${USD_LIB_DIR}/libusd_tf.so + ${USD_LIB_DIR}/libusd_usd.so + ${USD_LIB_DIR}/libusd_usdGeom.so + ${USD_LIB_DIR}/libusd_vt.so ) diff --git a/Finite-Element-Tests/tests/MembraneStretchPD/main.cpp b/Finite-Element-Tests/tests/MembraneStretchPD/main.cpp index cd02262..ce11b98 100644 --- a/Finite-Element-Tests/tests/MembraneStretchPD/main.cpp +++ b/Finite-Element-Tests/tests/MembraneStretchPD/main.cpp @@ -1,3 +1,5 @@ +#include + #include "FiniteElementMesh.h" #include