From 982c904c1cbb83f36a6728434d36952d18d63c34 Mon Sep 17 00:00:00 2001 From: Fan Jiang Date: Mon, 6 Jan 2020 18:52:09 -0500 Subject: [PATCH] Cleanup the cmake files --- cmake/GtsamCythonWrap.cmake | 6 +++--- gtsam/3rdparty/metis/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/GtsamCythonWrap.cmake b/cmake/GtsamCythonWrap.cmake index d6190447f..51ef4ab92 100644 --- a/cmake/GtsamCythonWrap.cmake +++ b/cmake/GtsamCythonWrap.cmake @@ -5,10 +5,10 @@ unset(PYTHON_EXECUTABLE CACHE) unset(CYTHON_EXECUTABLE CACHE) unset(PYTHON_INCLUDE_DIR CACHE) unset(PYTHON_MAJOR_VERSION CACHE) +unset(PYTHON_LIBRARY CACHE) -if(PYTHON_LIBRARY) - -else() +# Allow override from command line +if(NOT PYTHON_LIBRARY) if(GTSAM_PYTHON_VERSION STREQUAL "Default") find_package(PythonInterp REQUIRED) find_package(PythonLibs REQUIRED) diff --git a/gtsam/3rdparty/metis/CMakeLists.txt b/gtsam/3rdparty/metis/CMakeLists.txt index c3b25ef73..de46165ff 100644 --- a/gtsam/3rdparty/metis/CMakeLists.txt +++ b/gtsam/3rdparty/metis/CMakeLists.txt @@ -34,7 +34,7 @@ else() set(METIS_LIBRARY_TYPE STATIC) endif() -# Configure libmetis library. +# Allow a static METIS while building GTSAM as dynamic if(BUILD_STATIC_METIS) set(METIS_LIBRARY_TYPE STATIC) endif()