Unverified Commit fa7085be authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1930 from giacomofiorin/remove-lepton-cxx11-check

Remove now unneeded check for C++11 in Lepton CMake build
parents 3b73b88b de6d1efe
Loading
Loading
Loading
Loading
+1 −16
Original line number Diff line number Diff line
@@ -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)