From f664df729ca564a06989f94b1abdfdc8d8c18cd1 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Mon, 16 Dec 2013 21:32:55 +0000 Subject: [PATCH] Updated to new wrap functions in gtsam cmake --- gtsam/CMakeLists.txt | 10 ++-------- gtsam_unstable/CMakeLists.txt | 14 +++----------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 6f933ebba..b739f91c3 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -151,18 +151,12 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX) # Set up codegen include(GtsamMatlabWrap) - # Choose include flags depending on build process - set(MEX_INCLUDE_ROOT ${GTSAM_SOURCE_ROOT_DIR}) - set(MEX_LIB_ROOT ${CMAKE_BINARY_DIR}) # FIXME: is this used? - set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam) # FIXME: is this used? - # Generate, build and install toolbox set(mexFlags "${GTSAM_BUILD_MEX_BINARY_FLAGS}") if("${gtsam-default}" STREQUAL "gtsam-static") list(APPEND mexFlags -DGTSAM_IMPORT_STATIC) endif() - # Macro to handle details of setting up targets - # FIXME: issue with dependency between wrap_gtsam and wrap_gtsam_build, only shows up on CMake 2.8.3 - wrap_library(gtsam "${mexFlags}" "../" "${GTSAM_ADDITIONAL_LIBRARIES}") + # Wrap + wrap_and_install_library(../gtsam.h "${gtsam-default};${GTSAM_ADDITIONAL_LIBRARIES}" "" "${mexFlags}") endif () diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt index 60086ab52..72b6a97f6 100644 --- a/gtsam_unstable/CMakeLists.txt +++ b/gtsam_unstable/CMakeLists.txt @@ -99,23 +99,15 @@ endif() if (GTSAM_INSTALL_MATLAB_TOOLBOX) # Set up codegen include(GtsamMatlabWrap) - - # TODO: generate these includes programmatically - # Choose include flags depending on build process - set(MEX_INCLUDE_ROOT ${GTSAM_SOURCE_ROOT_DIR}) - set(MEX_LIB_ROOT ${CMAKE_BINARY_DIR}) # FIXME: is this used? - set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam) # FIXME: is this used? - set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT}/gtsam_unstable) # FIXME: is this used? - + # Generate, build and install toolbox set(mexFlags "${GTSAM_BUILD_MEX_BINARY_FLAGS}") if("${gtsam-default}" STREQUAL "gtsam-static") list(APPEND mexFlags -DGTSAM_IMPORT_STATIC) endif() - - # Macro to handle details of setting up targets - wrap_library(gtsam_unstable "${mexFlags}" "./" "gtsam") + # Wrap + wrap_and_install_library(gtsam_unstable.h "${gtsam-default};${gtsam_unstable-default}" "" "${mexFlags}") endif(GTSAM_INSTALL_MATLAB_TOOLBOX)