Jed Brown avatar Jed Brown committed 5059a90 Merge

Merge branch 'jed/config-openmp-cxx' into maint

* jed/config-openmp-cxx:
config cmakeboot: add C++ flags any time compiler is available
config OpenMP: check for C++ flag any time the compiler is available

Comments (0)

Files changed (2)

config/PETSc/packages/openmp.py

       self.setCompilers.pushLanguage('FC')
       self.setCompilers.addCompilerFlag(ompflag)
       self.setCompilers.popLanguage()
-    if self.languages.clanguage == 'Cxx':
+    if hasattr(self.compilers, 'CXX'):
       self.setCompilers.pushLanguage('Cxx')
       self.setCompilers.addCompilerFlag(ompflag)
       if self.setCompilers.checkLinkerFlag(ompflag):

config/cmakeboot.py

      langlist.append(('FC','Fortran'))
    if hasattr(self.compilers,'CUDAC'):
      langlist.append(('CUDA','CUDA'))
-   if (self.languages.clanguage == 'Cxx'):
+   if hasattr(self.compilers,'CXX'):
      langlist.append(('Cxx','CXX'))
    win32fe = None
    for petsclanguage,cmakelanguage in langlist:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.