dlib: update to 19.24.8
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
--- a/dlib/external/pybind11/tools/FindPythonLibsNew.cmake
|
||||
+++ b/dlib/external/pybind11/tools/FindPythonLibsNew.cmake
|
||||
@@ -204,7 +204,7 @@
|
||||
string(REGEX REPLACE "\\\\" "/" PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR}")
|
||||
string(REGEX REPLACE "\\\\" "/" PYTHON_SITE_PACKAGES "${PYTHON_SITE_PACKAGES}")
|
||||
@@ -233,7 +233,7 @@
|
||||
|
||||
-if(CMAKE_HOST_WIN32)
|
||||
+if(CMAKE_HOST_WIN32 AND NOT MINGW)
|
||||
if(DEFINED PYTHON_LIBRARY)
|
||||
# Don't write to PYTHON_LIBRARY if it's already set
|
||||
-elseif(CMAKE_HOST_WIN32)
|
||||
+elseif(CMAKE_HOST_WIN32 AND NOT MINGW)
|
||||
set(PYTHON_LIBRARY "${PYTHON_PREFIX}/libs/python${PYTHON_LIBRARY_SUFFIX}.lib")
|
||||
|
||||
# when run in a venv, PYTHON_PREFIX points to it. But the libraries remain in the
|
||||
|
||||
Reference in New Issue
Block a user