← Back to branch summary

~maddevelopers/mg5amcnlo/2.7.0_gpu

« back to all changes in this revision

Viewing changes to Template/NLO/Source/make_opts.inc

  • Committer: olivier-mattelaer
  • Date: 2021-12-02 13:17:09 UTC
  • mfrom: (284.2.17 version2)
  • Revision ID: olivier-mattelaer-20211202131709-lz0heed4xuz54b8l
merge with 2.9.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
Template/NLO/Source/make_opts.inc
93
93
  endif
94
94
  llhapdf = $(shell $(lhapdf) --libs)
95
95
  reweight_xsec_events_pdf_dummy=
96
 
  # check if we need to activate c++11 (for lhapdf6.2)
97
 
  ifeq ($(origin CXX),default)
98
 
    ifeq ($lhapdfversion$lhapdfsubversion,62)
99
 
      CXX=$(DEFAULT_CPP_COMPILER) -std=c++11
100
 
    else
101
 
      CXX=$(DEFAULT_CPP_COMPILER)
102
 
    endif
103
 
  endif      
104
96
else
105
97
  alfas_functions=alfas_functions
106
98
  llhapdf=
107
99
  reweight_xsec_events_pdf_dummy=reweight_xsec_events_pdf_dummy.o
108
 
  # Set CXX unless it's defined by an environment variable
109
 
  ifeq ($(origin CXX),default)
110
 
    CXX=$(DEFAULT_CPP_COMPILER)
111
 
  endif
112
 
endif
 
100
endif
 
101
 
 
102
# Set CXX unless it's defined by an environment variable
 
103
ifeq ($(origin CXX),default)
 
104
   CXX=$(DEFAULT_CPP_COMPILER) -std=c++11
 
105
endif
 
106
 
113
107
 
114
108
# Option APPLGrid
115
109
ifneq ($(applgrid),)