CMake: Fix generated pandac.PandaModules on Py2
Python 2 doesn't use the fully qualified module name in its ImportError output; only the local name. Test for that.
This commit is contained in:
parent
fe7fdc0976
commit
9645aaee07
|
|
@ -56,11 +56,12 @@ if(HAVE_PYTHON)
|
|||
print(\"Warning: pandac.PandaModules is deprecated, import from panda3d.core instead\")\n")
|
||||
|
||||
foreach(module ${ALL_INTERROGATE_MODULES})
|
||||
string(REGEX REPLACE "^.*\\." "" module_name "${module}")
|
||||
file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/pandac/PandaModules.py" "
|
||||
try:
|
||||
from ${module} import *
|
||||
except ImportError as err:
|
||||
if not (\"No module named\" in str(err) and \"${module}\" in str(err)):
|
||||
if not (\"No module named\" in str(err) and \"${module_name}\" in str(err)):
|
||||
raise
|
||||
")
|
||||
endforeach()
|
||||
|
|
|
|||
Loading…
Reference in New Issue