git-svn-id: svn://db.shs.com.ru/pip@904 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2020-03-05 21:14:28 +00:00
parent 45137053ff
commit 6dff576888
6 changed files with 33 additions and 30 deletions

View File

@@ -362,14 +362,8 @@ bool PIInit::isBuildOptionEnabled(PIInit::BuildOption o) {
#else
false;
#endif
case IntrospectionContainers: return
#ifdef PIP_INTROSPECTION_CONTAINERS
true;
#else
false;
#endif
case IntrospectionThreads: return
#ifdef PIP_INTROSPECTION_THREADS
case Introspection: return
#ifdef PIP_INTROSPECTION
true;
#else
false;
@@ -404,8 +398,7 @@ PIStringList PIInit::buildOptions() {
if (isBuildOptionEnabled(USB)) ret << "USB";
if (isBuildOptionEnabled(STL)) ret << "STL";
if (isBuildOptionEnabled(Crypt)) ret << "Crypt";
if (isBuildOptionEnabled(IntrospectionContainers)) ret << "IntrospectionContainers";
if (isBuildOptionEnabled(IntrospectionThreads)) ret << "IntrospectionThreads";
if (isBuildOptionEnabled(Introspection)) ret << "Introspection";
if (isBuildOptionEnabled(FFTW)) ret << "FFTW";
if (isBuildOptionEnabled(Compress)) ret << "Compress";
if (isBuildOptionEnabled(OpenCL)) ret << "OpenCL";