mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-31 05:03:22 +08:00
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
|
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
|
||
|
|
index e11de1815..a25a9883d 100644
|
||
|
|
--- a/cmake/Config.cmake.in
|
||
|
|
+++ b/cmake/Config.cmake.in
|
||
|
|
@@ -4,13 +4,8 @@
|
||
|
|
|
||
|
|
# Compute paths
|
||
|
|
get_filename_component(OUR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||
|
|
-if(EXISTS "${OUR_CMAKE_DIR}/CMakeCache.txt")
|
||
|
|
- # In build tree
|
||
|
|
- set(@PACKAGE_NAME@_INCLUDE_DIR @GTSAM_SOURCE_DIR@ CACHE PATH "@PACKAGE_NAME@ include directory")
|
||
|
|
-else()
|
||
|
|
- # Find installed library
|
||
|
|
- set(@PACKAGE_NAME@_INCLUDE_DIR "${OUR_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@" CACHE PATH "@PACKAGE_NAME@ include directory")
|
||
|
|
-endif()
|
||
|
|
+# Find installed library
|
||
|
|
+set(@PACKAGE_NAME@_INCLUDE_DIR "${OUR_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@" CACHE PATH "@PACKAGE_NAME@ include directory")
|
||
|
|
|
||
|
|
# Find dependencies, required by cmake exported targets:
|
||
|
|
include(CMakeFindDependencyMacro)
|
||
|
|
diff --git a/gtsam/config.h.in b/gtsam/config.h.in
|
||
|
|
index d47329a62..60ca62931 100644
|
||
|
|
--- a/gtsam/config.h.in
|
||
|
|
+++ b/gtsam/config.h.in
|
||
|
|
@@ -25,7 +25,7 @@
|
||
|
|
#define GTSAM_VERSION_STRING "@GTSAM_VERSION_STRING@"
|
||
|
|
|
||
|
|
// Paths to example datasets distributed with GTSAM
|
||
|
|
-#define GTSAM_SOURCE_TREE_DATASET_DIR "@GTSAM_SOURCE_DIR@/examples/Data"
|
||
|
|
+#define GTSAM_SOURCE_TREE_DATASET_DIR ""
|
||
|
|
#define GTSAM_INSTALLED_DATASET_DIR "@GTSAM_TOOLBOX_INSTALL_PATH@/gtsam_examples/Data"
|
||
|
|
|
||
|
|
// Whether GTSAM is compiled to use quaternions for Rot3 (otherwise uses rotation matrices)
|