Cleanup the cmake files
parent
4f214b5e6b
commit
982c904c1c
|
@ -5,10 +5,10 @@ unset(PYTHON_EXECUTABLE CACHE)
|
||||||
unset(CYTHON_EXECUTABLE CACHE)
|
unset(CYTHON_EXECUTABLE CACHE)
|
||||||
unset(PYTHON_INCLUDE_DIR CACHE)
|
unset(PYTHON_INCLUDE_DIR CACHE)
|
||||||
unset(PYTHON_MAJOR_VERSION CACHE)
|
unset(PYTHON_MAJOR_VERSION CACHE)
|
||||||
|
unset(PYTHON_LIBRARY CACHE)
|
||||||
|
|
||||||
if(PYTHON_LIBRARY)
|
# Allow override from command line
|
||||||
|
if(NOT PYTHON_LIBRARY)
|
||||||
else()
|
|
||||||
if(GTSAM_PYTHON_VERSION STREQUAL "Default")
|
if(GTSAM_PYTHON_VERSION STREQUAL "Default")
|
||||||
find_package(PythonInterp REQUIRED)
|
find_package(PythonInterp REQUIRED)
|
||||||
find_package(PythonLibs REQUIRED)
|
find_package(PythonLibs REQUIRED)
|
||||||
|
|
|
@ -34,7 +34,7 @@ else()
|
||||||
set(METIS_LIBRARY_TYPE STATIC)
|
set(METIS_LIBRARY_TYPE STATIC)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Configure libmetis library.
|
# Allow a static METIS while building GTSAM as dynamic
|
||||||
if(BUILD_STATIC_METIS)
|
if(BUILD_STATIC_METIS)
|
||||||
set(METIS_LIBRARY_TYPE STATIC)
|
set(METIS_LIBRARY_TYPE STATIC)
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue