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

Reverted change to make files to make the pull request clean.

release/4.3a0
Simon Julier 2017-01-19 09:28:04 +00:00
parent d8d7c5618a
commit d1422ac921
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/GtsamMatlabWrap.cmake
View File

@ -70,8 +70,7 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex
set(mexModuleExt mexglx) set(mexModuleExt mexglx)
endif() endif()
elseif(APPLE) elseif(APPLE)
set(mexModuleExt mexmaci64) set(mexModuleExt mexmaci64)
set(CMAKE_INSTALL_DIR_NAME ${GTSAM_TOOLBOX_INSTALL_PATH})
elseif(MSVC) elseif(MSVC)
if(CMAKE_CL_64) if(CMAKE_CL_64)
set(mexModuleExt mexw64) set(mexModuleExt mexw64)

4
gtsam/CMakeLists.txt
View File

@ -113,10 +113,6 @@ if (GTSAM_BUILD_STATIC_LIBRARY)
PREFIX "lib" PREFIX "lib"
COMPILE_DEFINITIONS GTSAM_IMPORT_STATIC) COMPILE_DEFINITIONS GTSAM_IMPORT_STATIC)
endif() endif()
if(APPLE) # Set the
set_target_properties(gtsam PROPERTIES
INSTALL_DIR_NAME ${CMAKE_INSTALL_PREFIX}/lib)
endif()
install(TARGETS gtsam EXPORT GTSAM-exports ARCHIVE DESTINATION lib) install(TARGETS gtsam EXPORT GTSAM-exports ARCHIVE DESTINATION lib)
list(APPEND GTSAM_EXPORTED_TARGETS gtsam) list(APPEND GTSAM_EXPORTED_TARGETS gtsam)
set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE) set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE)