From de6d1efe7ae79c713c949ebb2eec8f20ef44ad0d Mon Sep 17 00:00:00 2001 From: Giacomo Fiorin Date: Thu, 12 Mar 2020 10:33:48 -0400 Subject: [PATCH] Remove now unneeded check for C++ standard in Lepton CMake build --- cmake/Modules/Packages/USER-COLVARS.cmake | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/cmake/Modules/Packages/USER-COLVARS.cmake b/cmake/Modules/Packages/USER-COLVARS.cmake index b7fb91917c..a112fbb6aa 100644 --- a/cmake/Modules/Packages/USER-COLVARS.cmake +++ b/cmake/Modules/Packages/USER-COLVARS.cmake @@ -5,22 +5,7 @@ if(PKG_USER-COLVARS) file(GLOB COLVARS_SOURCES ${COLVARS_SOURCE_DIR}/[^.]*.cpp) # Build Lepton by default - set(COLVARS_LEPTON_DEFAULT ON) - # but not if C++11 is disabled per user request - if(DEFINED DISABLE_CXX11_REQUIREMENT) - if(DISABLE_CXX11_REQUIREMENT) - set(COLVARS_LEPTON_DEFAULT OFF) - endif() - endif() - - option(COLVARS_LEPTON "Build and link the Lepton library" ${COLVARS_LEPTON_DEFAULT}) - - # Verify that the user's choice is consistent - if(DEFINED DISABLE_CXX11_REQUIREMENT) - if((DISABLE_CXX11_REQUIREMENT) AND (COLVARS_LEPTON)) - message(FATAL_ERROR "Building the Lepton library requires C++11 or later.") - endif() - endif() + option(COLVARS_LEPTON "Build and link the Lepton library" ON) if(COLVARS_LEPTON) set(LEPTON_DIR ${LAMMPS_LIB_SOURCE_DIR}/colvars/lepton)