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

Added support for compiling lpsolve on linux. Windows not tested

release/4.3a0
krunalchande 2014-12-12 17:21:07 -05:00
parent e12add2739
commit 181bfb4f0f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/3rdparty/lp_solve_5.5/lpsolve55/ccc vendored
View File

@ -12,7 +12,7 @@ fi
opts='-O3' opts='-O3'
$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
ranlib liblpsolve55.a ranlib liblpsolve55.a

18
gtsam_unstable/CMakeLists.txt
View File

@ -37,15 +37,19 @@ unset(lpsolve_INCLUDE_DIRS CACHE)
include(${CMAKE_SOURCE_DIR}/gtsam/3rdparty/lp_solve_5.5/cmake/Findlpsolve.cmake) include(${CMAKE_SOURCE_DIR}/gtsam/3rdparty/lp_solve_5.5/cmake/Findlpsolve.cmake)
# If lpsolve_LIBRARY is not found, recompile the library # If lpsolve_LIBRARY is not found, recompile the library
message("lpsolve_LIBRARY: " ${lpsolve_LIBRARY} " ...") message("lpsolve_LIBRARY: " ${lpsolve_LIBRARY} " ...")
message("lpsolve_BUILD_PATH" ${lpsolve_BUILD_PATH})
if(NOT lpsolve_LIBRARY) if(NOT lpsolve_LIBRARY)
if(APPLE)
set(lpsolve_BUILD_SCRIPT sh ccc.osx)
elseif(UNIX)
set(lpsolve_BUILD_SCRIPT sh ccc)
elseif(WIN32)
set(lpsolve_BUILD_SCRIPT cvc6.bat)
endif()
message("Building lpsolve. Please wait...") message("Building lpsolve. Please wait...")
# TODO: customize for other platforms execute_process(COMMAND ${lpsolve_BUILD_SCRIPT}
execute_process(COMMAND sh ccc.osx WORKING_DIRECTORY ${lpsolve_BUILD_PATH})
WORKING_DIRECTORY ${lpsolve_BUILD_PATH}
OUTPUT_QUIET
ERROR_QUIET)
#set(lpsolve_INCLUDE_DIRS ${lpsolve_BUILD_PATH}/../)
#set(lpsolve_LIBRARY ${lpsolve_BUILD_PATH}/liblpsolve55.a)
include(${CMAKE_SOURCE_DIR}/gtsam/3rdparty/lp_solve_5.5/cmake/Findlpsolve.cmake) include(${CMAKE_SOURCE_DIR}/gtsam/3rdparty/lp_solve_5.5/cmake/Findlpsolve.cmake)
message("Done!") message("Done!")
endif() endif()