Merge pull request RainerKuemmerle#229 from jumonatr/addoptions

Add Flags to Disable Cholmod and CSParse
mtau87 · Dec 19, 2017 · bbd0eb5 · bbd0eb5
2 parents d652b0b + 83f899b
commit bbd0eb5
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -93,25 +93,35 @@ IF(ANDROID)
 ENDIF()
 
 # For building the CHOLMOD / CSPARSE solvers
+OPTION (G2O_USE_CHOLMOD "Build g2o with CHOLMOD support" ON)
+
 FIND_PACKAGE(Cholmod)
 FIND_PACKAGE(BLAS)
 FIND_PACKAGE(LAPACK)
-IF(CHOLMOD_FOUND AND BLAS_FOUND AND LAPACK_FOUND)
+
+IF(G2O_USE_CHOLMOD AND CHOLMOD_FOUND AND BLAS_FOUND AND LAPACK_FOUND)
   MESSAGE(STATUS "Found CHOLMOD and its dependencies")
   SET(CHOLMOD_FOUND TRUE)
 ELSE()
   SET(CHOLMOD_FOUND FALSE)
 ENDIF()
 
+OPTION (G2O_USE_CSPARSE "Build g2o with CSParse support" ON)
+
 FIND_PACKAGE(CSparse)
-IF(CSPARSE_FOUND)
-  SET(BUILD_CSPARSE OFF CACHE BOOL "Build local CSparse library")
-ELSE(CSPARSE_FOUND)
-  SET(BUILD_CSPARSE ON CACHE BOOL "Build local CSparse library")
-  IF(BUILD_CSPARSE)
-    SET(CSPARSE_FOUND TRUE)
-  ENDIF()
-ENDIF(CSPARSE_FOUND)
+IF (G2O_USE_CSPARSE)
+  IF(CSPARSE_FOUND)
+    SET(BUILD_CSPARSE OFF CACHE BOOL "Build local CSparse library")
+  ELSE(CSPARSE_FOUND)
+    SET(BUILD_CSPARSE ON CACHE BOOL "Build local CSparse library")
+    IF(BUILD_CSPARSE)
+      SET(CSPARSE_FOUND TRUE)
+    ENDIF()
+  ENDIF(CSPARSE_FOUND)
+ELSE(G2O_USE_CSPARSE)
+  SET(BUILD_CSPARSE OFF "Build local CSparse library")
+ENDIF(G2O_USE_CSPARSE)
+
 OPTION(BUILD_LGPL_SHARED_LIBS "Build LGPL Code as Shared Libraries (LGPL Code)" ON)
 SET (G2O_LGPL_LIB_TYPE STATIC)
 IF (BUILD_LGPL_SHARED_LIBS)

diff --git a/EXTERNAL/CMakeLists.txt b/EXTERNAL/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Only build CSPARSE if we need to
-IF(BUILD_CSPARSE)
+IF(BUILD_CSPARSE AND G2O_USE_CSPARSE)
   ADD_SUBDIRECTORY(csparse)
-ENDIF(BUILD_CSPARSE)
+ENDIF()
 
 IF (G2O_HAVE_OPENGL)
   ADD_SUBDIRECTORY(freeglut)

diff --git a/g2o/solvers/cholmod/CMakeLists.txt b/g2o/solvers/cholmod/CMakeLists.txt
@@ -1,3 +1,7 @@
+IF (NOT G2O_USE_CHOLMOD)
+  RETURN()
+ENDIF()
+
 ADD_LIBRARY(solver_cholmod ${G2O_LIB_TYPE}
   solver_cholmod.cpp
   linear_solver_cholmod.h

diff --git a/g2o/solvers/csparse/CMakeLists.txt b/g2o/solvers/csparse/CMakeLists.txt
@@ -1,3 +1,7 @@
+IF(NOT G2O_USE_CSPARSE)
+  RETURN()
+ENDIF()
+
 INCLUDE_DIRECTORIES(${CSPARSE_INCLUDE_DIR})
 
 ADD_LIBRARY(csparse_extension ${G2O_LGPL_LIB_TYPE}

diff --git a/g2o/solvers/slam2d_linear/CMakeLists.txt b/g2o/solvers/slam2d_linear/CMakeLists.txt
@@ -1,3 +1,7 @@
+IF(NOT G2O_USE_CSPARSE)
+  RETURN()
+ENDIF()
+
 ADD_LIBRARY(solver_slam2d_linear ${G2O_LIB_TYPE}
   slam2d_linear.cpp
   solver_slam2d_linear.h solver_slam2d_linear.cpp