mirror of
https://github.com/boostorg/predef.git
synced 2025-08-02 13:04:26 +02:00
Merge pull request #18 from boostorg/develop
Merge MSVC version and metadata changes.
This commit is contained in:
@@ -48,11 +48,24 @@ Version number available as major, minor, and patch.
|
|||||||
# error "Cannot determine build number from _MSC_FULL_VER"
|
# error "Cannot determine build number from _MSC_FULL_VER"
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
|
/*
|
||||||
|
VS2014 was skipped in the release sequence for MS. Which
|
||||||
|
means that the compiler and VS product versions are no longer
|
||||||
|
in sync. Hence we need to use different formulas for
|
||||||
|
mapping from MSC version to VS product version.
|
||||||
|
*/
|
||||||
|
# if (_MSC_VER >= 1900)
|
||||||
|
# define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\
|
||||||
|
_MSC_VER/100-5,\
|
||||||
|
_MSC_VER%100,\
|
||||||
|
BOOST_COMP_MSVC_BUILD)
|
||||||
|
# else
|
||||||
# define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\
|
# define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\
|
||||||
_MSC_VER/100-6,\
|
_MSC_VER/100-6,\
|
||||||
_MSC_VER%100,\
|
_MSC_VER%100,\
|
||||||
BOOST_COMP_MSVC_BUILD)
|
BOOST_COMP_MSVC_BUILD)
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef BOOST_COMP_MSVC_DETECTION
|
#ifdef BOOST_COMP_MSVC_DETECTION
|
||||||
# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED)
|
# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED)
|
||||||
|
14
meta/libraries.json
Normal file
14
meta/libraries.json
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"key": "predef",
|
||||||
|
"name": "Predef",
|
||||||
|
"authors": [
|
||||||
|
"Rene Rivera"
|
||||||
|
],
|
||||||
|
"description": "This library defines a set of compiler, architecture, operating system, library, and other version numbers from the information it can gather of C, C++, Objective C, and Objective C++ predefined macros or those defined in generally available headers.",
|
||||||
|
"category": [
|
||||||
|
"Miscellaneous"
|
||||||
|
],
|
||||||
|
"maintainers": [
|
||||||
|
"Rene Rivera <grafikrobot -at- gmail.com>"
|
||||||
|
]
|
||||||
|
}
|
Reference in New Issue
Block a user