Mercurial > hg > vamp-build-and-test
comparison DEPENDENCIES/generic/include/boost/config/select_compiler_config.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
comparison
equal
deleted
inserted
replaced
100:793467b5e61c | 101:c530137014c0 |
---|---|
37 | 37 |
38 #elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC) | 38 #elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC) |
39 // Intel | 39 // Intel |
40 # define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp" | 40 # define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp" |
41 | 41 |
42 #elif defined __clang__ | 42 #elif defined __clang__ && !defined(__CUDACC__) |
43 // when using clang and cuda at same time, you want to appear as gcc | |
43 // Clang C++ emulates GCC, so it has to appear early. | 44 // Clang C++ emulates GCC, so it has to appear early. |
44 # define BOOST_COMPILER_CONFIG "boost/config/compiler/clang.hpp" | 45 # define BOOST_COMPILER_CONFIG "boost/config/compiler/clang.hpp" |
45 | 46 |
46 #elif defined __DMC__ | 47 #elif defined __DMC__ |
47 // Digital Mars C++ | 48 // Digital Mars C++ |
110 // this must come last - generate an error if we don't | 111 // this must come last - generate an error if we don't |
111 // recognise the compiler: | 112 // recognise the compiler: |
112 # error "Unknown compiler - please configure (http://www.boost.org/libs/config/config.htm#configuring) and report the results to the main boost mailing list (http://www.boost.org/more/mailing_lists.htm#main)" | 113 # error "Unknown compiler - please configure (http://www.boost.org/libs/config/config.htm#configuring) and report the results to the main boost mailing list (http://www.boost.org/more/mailing_lists.htm#main)" |
113 | 114 |
114 #endif | 115 #endif |
116 | |
117 #if 0 | |
118 // | |
119 // This section allows dependency scanners to find all the headers we *might* include: | |
120 // | |
121 #include "boost/config/compiler/gcc_xml.hpp" | |
122 #include "boost/config/compiler/cray.hpp" | |
123 #include "boost/config/compiler/comeau.hpp" | |
124 #include "boost/config/compiler/pathscale.hpp" | |
125 #include "boost/config/compiler/intel.hpp" | |
126 #include "boost/config/compiler/clang.hpp" | |
127 #include "boost/config/compiler/digitalmars.hpp" | |
128 #include "boost/config/compiler/gcc.hpp" | |
129 #include "boost/config/compiler/kai.hpp" | |
130 #include "boost/config/compiler/sgi_mipspro.hpp" | |
131 #include "boost/config/compiler/compaq_cxx.hpp" | |
132 #include "boost/config/compiler/greenhills.hpp" | |
133 #include "boost/config/compiler/codegear.hpp" | |
134 #include "boost/config/compiler/borland.hpp" | |
135 #include "boost/config/compiler/metrowerks.hpp" | |
136 #include "boost/config/compiler/sunpro_cc.hpp" | |
137 #include "boost/config/compiler/hp_acc.hpp" | |
138 #include "boost/config/compiler/mpw.hpp" | |
139 #include "boost/config/compiler/vacpp.hpp" | |
140 #include "boost/config/compiler/pgi.hpp" | |
141 #include "boost/config/compiler/visualc.hpp" | |
142 | |
143 #endif | |
144 |