Skip to content

Commit 7386656

Browse files
committed
[09/30/2022] 在Windows和Ubuntu下使用不同的输出
在Windows和Ubuntu下使用不同的输出
1 parent 9ce4fac commit 7386656

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

matplotlib.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ static bool __XXX_YYY_ZZZ_INIT__() {
6161
if (CONDA_PREFIX.empty()) {
6262
// do default python config
6363
} else {
64-
const std::string PYTHON_VERSION = __XXX_YYY_ZZZ_COMMAND__(
65-
"python3 --version | cut -d ' ' -f2 | cut -d '.' -f-2");
6664
#ifdef _WIN32
6765
const std::string PYTHONHOME = CONDA_PREFIX + R"(\lib)";
6866
const std::string PYTHONPATH = PYTHONHOME + ";" + PYTHONHOME +
@@ -74,18 +72,26 @@ static bool __XXX_YYY_ZZZ_INIT__() {
7472
_putenv_s("PYTHONPATH", PYTHONPATH.c_str());
7573
_putenv_s("QT_QPA_PLATFORM_PLUGIN_PATH",
7674
QT_QPA_PLATFORM_PLUGIN_PATH.c_str());
75+
std::cout << "PYTHONHOME : " << myenv("PYTHONHOME")
76+
<< std::endl;
77+
std::cout << "PYTHONPATH : " << myenv("PYTHONPATH")
78+
<< std::endl;
79+
std::cout << "QT_QPA_PLATFORM_PLUGIN_PATH: "
80+
<< myenv("QT_QPA_PLATFORM_PLUGIN_PATH") << std::endl;
7781
#else
82+
const std::string PYTHON_VERSION = __XXX_YYY_ZZZ_COMMAND__(
83+
"python3 --version | cut -d ' ' -f2 | cut -d '.' -f-2");
7884
const std::string PYTHONHOME =
7985
CONDA_PREFIX + "/lib/python" + PYTHON_VERSION;
8086
const std::string PYTHONPATH = PYTHONHOME + ":" + PYTHONHOME +
8187
"/site-packages:" + PYTHONHOME +
8288
"/lib-dynload";
8389
setenv("PYTHONHOME", PYTHONHOME.c_str(), 1);
8490
setenv("PYTHONPATH", PYTHONPATH.c_str(), 1);
85-
#endif
8691
std::cout << "PYTHON_VERSION: " << PYTHON_VERSION << std::endl;
8792
std::cout << "PYTHONHOME : " << myenv("PYTHONHOME") << std::endl;
8893
std::cout << "PYTHONPATH : " << myenv("PYTHONPATH") << std::endl;
94+
#endif
8995
}
9096

9197
return true;

0 commit comments

Comments
 (0)