Fix up timing and examples

release/4.3a0
Frank Dellaert 2023-02-06 01:44:55 -08:00
parent aac277d949
commit c6dd2bb0f0
5 changed files with 25 additions and 11 deletions

View File

@ -1,11 +1,11 @@
set (excluded_examples set (excluded_examples
elaboratePoint2KalmanFilter.cpp "elaboratePoint2KalmanFilter.cpp"
) )
# if GTSAM_ENABLE_BOOST_SERIALIZATION is not set then SolverComparer.cpp will not compile # if GTSAM_ENABLE_BOOST_SERIALIZATION is not set then SolverComparer.cpp will not compile
if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION) if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
list (APPEND excluded_examples list (APPEND excluded_examples
SolverComparer.cpp "SolverComparer.cpp"
) )
endif() endif()
@ -13,10 +13,10 @@ endif()
if (NOT GTSAM_USE_BOOST_FEATURES) if (NOT GTSAM_USE_BOOST_FEATURES)
# add to excluded examples # add to excluded examples
list (APPEND excluded_examples list (APPEND excluded_examples
CombinedImuFactorsExample.run "CombinedImuFactorsExample.cpp"
ImuFactorsExample.run "ImuFactorsExample.cpp"
ShonanAveragingCLI.cpp "ShonanAveragingCLI.cpp"
SolverComparer.cpp "SolverComparer.cpp"
) )
endif() endif()

View File

@ -1,3 +1,12 @@
set (excluded_examples "") set (excluded_examples "")
# Add examples to exclude if GTSAM_USE_BOOST_FEATURES is not set
if (NOT GTSAM_USE_BOOST_FEATURES)
# add to excluded examples
list (APPEND excluded_examples
"GncPoseAveragingExample.cpp"
)
endif()
gtsamAddExamplesGlob("*.cpp" "${excluded_examples}" "gtsam_unstable") gtsamAddExamplesGlob("*.cpp" "${excluded_examples}" "gtsam_unstable")

View File

@ -1,15 +1,22 @@
set (excluded_scripts set (excluded_scripts
elaboratePoint2KalmanFilter.cpp elaboratePoint2KalmanFilter.cpp
) )
# Add scripts to exclude if GTSAM_ENABLE_BOOST_SERIALIZATION is not set
if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
# add to excluded scripts
list (APPEND excluded_scripts
"timeIncremental.cpp"
)
endif()
# Add scripts to exclude if GTSAM_USE_BOOST_FEATURES is not set # Add scripts to exclude if GTSAM_USE_BOOST_FEATURES is not set
if (NOT GTSAM_USE_BOOST_FEATURES) if (NOT GTSAM_USE_BOOST_FEATURES)
# add to excluded scripts # add to excluded scripts
list (APPEND excluded_scripts list (APPEND excluded_scripts
timeISAM2Chain.cpp "timeISAM2Chain.cpp"
) )
endif() endif()
gtsamAddTimingGlob("*.cpp" "${excluded_scripts}" "gtsam")
gtsamAddTimingGlob("*.cpp" excluded_scripts "gtsam")
target_link_libraries(timeGaussianFactorGraph CppUnitLite) target_link_libraries(timeGaussianFactorGraph CppUnitLite)

View File

@ -23,7 +23,6 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace boost;
using namespace gtsam; using namespace gtsam;
struct Plain { struct Plain {

View File

@ -21,7 +21,6 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace boost;
using namespace gtsam; using namespace gtsam;
struct DtorTestBase { struct DtorTestBase {