haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch pybind11 for MSVC 

Pulls a series of patches for MSVC options from earlier in tree
This commit is contained in:
Marek Roszko 2021-04-27 21:44:07 -04:00 committed by Seth Hillbrand
parent 30987cebfe
commit ef38642bf1
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/pybind11/include/pybind11/detail/common.h vendored
View File

@ -129,7 +129,6 @@
# define HAVE_SNPRINTF 1
#endif
/// Include Python header, disable linking to pythonX_d.lib on Windows in debug mode
#if defined(_MSC_VER)
# if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 4)
# define HAVE_ROUND 1
@ -141,6 +140,7 @@
# define PYBIND11_DEBUG_MARKER
# undef _DEBUG
# endif
# pragma warning(disable: 4510 4610 4512 4005)
#endif
// https://en.cppreference.com/w/c/chrono/localtime

21
thirdparty/pybind11/tools/FindPythonLibsNew.cmake vendored
View File

@ -188,6 +188,21 @@ if(CMAKE_HOST_WIN32)
if(NOT EXISTS "${PYTHON_LIBRARY}")
get_filename_component(_PYTHON_ROOT ${PYTHON_INCLUDE_DIR} DIRECTORY)
set(PYTHON_LIBRARY "${_PYTHON_ROOT}/libs/python${PYTHON_LIBRARY_SUFFIX}.lib")
elseif(DEFINED VCPKG_TOOLCHAIN AND NOT EXISTS "${PYTHON_LIBRARY}")
set(PYTHON_LIBRARY "${PYTHON_PREFIX}/../../lib/python${PYTHON_LIBRARY_SUFFIX}.lib")
endif()
if(DEFINED VCPKG_TOOLCHAIN)
unset(PYTHON_LIBRARY)
find_library(
PYTHON_LIBRARY
NAMES "python${PYTHON_LIBRARY_SUFFIX}"
NO_SYSTEM_ENVIRONMENT_PATH)
find_library(PYTHON_DEBUG_LIBRARY
NAMES python${PYTHON_LIBRARY_SUFFIX}_d
NO_SYSTEM_ENVIRONMENT_PATH
)
endif()
# if we are in MSYS & MINGW, and we didn't find windows python lib, look for system python lib
@ -233,7 +248,7 @@ else()
endif()
endif()
mark_as_advanced(PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
mark_as_advanced(PYTHON_DEBUG_LIBRARY PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
# We use PYTHON_INCLUDE_DIR, PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the
# cache entries because they are meant to specify the location of a single
@ -246,6 +261,10 @@ if(NOT PYTHON_DEBUG_LIBRARY)
endif()
set(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
set(PYTHON_LIBRARY_DEBUG "${PYTHON_DEBUG_LIBRARY}")
set(PYTHON_LIBRARY_RELEASE "${PYTHON_LIBRARY}")
select_library_configurations(PYTHON)
find_package_message(PYTHON "Found PythonLibs: ${PYTHON_LIBRARY}"
"${PYTHON_EXECUTABLE}${PYTHON_VERSION_STRING}")

16
thirdparty/pybind11/tools/pybind11Tools.cmake vendored
View File

@ -120,8 +120,11 @@ set_property(
TARGET pybind11::module
APPEND
PROPERTY
INTERFACE_LINK_LIBRARIES pybind11::python_link_helper
"$<$<OR:$<PLATFORM_ID:Windows>,$<PLATFORM_ID:Cygwin>>:$<BUILD_INTERFACE:${PYTHON_LIBRARIES}>>")
INTERFACE_LINK_LIBRARIES pybind11::python_link_helper)
if(WIN32)
target_link_libraries(pybind11::module INTERFACE ${PYTHON_LIBRARIES})
endif()
if(PYTHON_VERSION VERSION_LESS 3)
set_property(
@ -130,10 +133,13 @@ if(PYTHON_VERSION VERSION_LESS 3)
PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python2_no_register)
endif()
# KiCad Workaround, this ends tying release libraries into debug builds which doesn't end well
set_property(
TARGET pybind11::embed
APPEND
PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11 $<BUILD_INTERFACE:${PYTHON_LIBRARIES}>)
TARGET pybind11::embed
APPEND
PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11)
target_link_libraries(pybind11::embed INTERFACE ${PYTHON_LIBRARIES})
function(pybind11_extension name)
# The prefix and extension are provided by FindPythonLibsNew.cmake