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

Removed unnecessary linking cmake option

release/4.3a0
Alex Cunningham 2012-02-23 19:15:26 +00:00
parent 1d0aaacbd6
commit 736a3ae1a9
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -39,9 +39,7 @@ option(GTSAM_BUILD_TESTS "Enable/Disable building of tests" ON)
option(GTSAM_BUILD_TIMING "Enable/Disable building of timing scripts" ON)
option(GTSAM_BUILD_EXAMPLES "Enable/Disable building of examples" ON)
option(GTSAM_BUILD_WRAP "Enable/Disable building of matlab wrap utility (necessary for matlab interface)" ON)
option(GTSAM_BUILD_CONVENIENCE_LIBRARIES "Enable/Disable using convenience librares for tests" ON)
option(GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS
"Enable/Disable linking tests against the convenince libraries for faster debugging" ON)
option(GTSAM_BUILD_CONVENIENCE_LIBRARIES "Enable/Disable using convenience librares for tests and examples" ON)
# Avoid building non-installed exes and unit tests when installing
# FIXME: breaks generation and install of matlab toolbox

6
tests/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if (GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS)
if (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
set(convenience_libs
slam
nonlinear
@ -7,10 +7,10 @@ if (GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS)
geometry
base
ccolamd)
else (GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS)
else (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
set(convenience_libs
gtsam-static)
endif (GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS)
endif (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
# exclude certain files
# note the source dir on each