12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed broken merge

release/4.3a0
Jai Moraes 2025-01-10 11:00:14 -05:00
parent 8489ebcab5
commit 77c5c574d3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/config.h.in
View File

@ -26,11 +26,7 @@
// Paths to example datasets distributed with GTSAM // Paths to example datasets distributed with GTSAM
#define GTSAM_SOURCE_TREE_DATASET_DIR "@GTSAM_SOURCE_DIR@/examples/Data" #define GTSAM_SOURCE_TREE_DATASET_DIR "@GTSAM_SOURCE_DIR@/examples/Data"
<<<<<<< HEAD
#ifndef __QNX__
=======
#if !defined(__QNX__) #if !defined(__QNX__)
>>>>>>> 93f463ddbf8e990e6dccc622fcb8ecb67f21549a
#define GTSAM_INSTALLED_DATASET_DIR "@GTSAM_TOOLBOX_INSTALL_PATH@/gtsam_examples/Data" #define GTSAM_INSTALLED_DATASET_DIR "@GTSAM_TOOLBOX_INSTALL_PATH@/gtsam_examples/Data"
#else #else
//Set toolbox path to the path on the target. //Set toolbox path to the path on the target.