SIPMacros.cmake (krita-5.1.3.tar.xz) | : | SIPMacros.cmake (krita-5.1.4.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 119 | skipping to change at line 119 | |||
ENDIF (WIN32 OR CYGWIN OR APPLE) | ENDIF (WIN32 OR CYGWIN OR APPLE) | |||
TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY}) | TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY}) | |||
TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES}) | TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES}) | |||
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_c hild_module_name}) | SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_c hild_module_name}) | |||
IF (MINGW) | IF (MINGW) | |||
TARGET_COMPILE_DEFINITIONS(${_logical_name} PRIVATE _hypot=hypot) | TARGET_COMPILE_DEFINITIONS(${_logical_name} PRIVATE _hypot=hypot) | |||
ENDIF (MINGW) | ENDIF (MINGW) | |||
if (MSVC) | if (MSVC) | |||
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PDB_NAME "PyKrita.krit a") | SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PDB_NAME "sip_v4_${_lo gical_name}") | |||
ENDIF (MSVC) | ENDIF (MSVC) | |||
IF (WIN32) | IF (WIN32) | |||
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd") | SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd") | |||
ENDIF (WIN32) | ENDIF (WIN32) | |||
INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_INSTALL _DIR}/${_parent_module_path}") | INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_INSTALL _DIR}/${_parent_module_path}") | |||
if (MSVC) | if (MSVC) | |||
INSTALL( | INSTALL( | |||
FILES $<TARGET_PDB_FILE:${_logical_name}> | FILES $<TARGET_PDB_FILE:${_logical_name}> | |||
DESTINATION "${PYTHON_SITE_PACKAGES_INSTALL_DIR}/${_parent_module_pa th}" | DESTINATION "${PYTHON_SITE_PACKAGES_INSTALL_DIR}/${_parent_module_pa th}" | |||
RENAME ${_child_module_name}.pdb | ||||
OPTIONAL | OPTIONAL | |||
) | ) | |||
endif() | endif() | |||
ENDMACRO(ADD_SIP_PYTHON_MODULE) | ENDMACRO(ADD_SIP_PYTHON_MODULE) | |||
else() | else() | |||
find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} NO_CMAKE _FIND_ROOT_PATH) | find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} NO_CMAKE _FIND_ROOT_PATH) | |||
find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} NO_C MAKE_FIND_ROOT_PATH) | find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} NO_C MAKE_FIND_ROOT_PATH) | |||
skipping to change at line 237 | skipping to change at line 236 | |||
target_link_libraries(${_logical_name} ${PYTHON_LIBRARY}) | target_link_libraries(${_logical_name} ${PYTHON_LIBRARY}) | |||
target_link_libraries(${_logical_name} ${EXTRA_LINK_LIBRARIES}) | target_link_libraries(${_logical_name} ${EXTRA_LINK_LIBRARIES}) | |||
set_target_properties(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name}) | set_target_properties(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name}) | |||
if (MINGW) | if (MINGW) | |||
target_compile_definitions(${_logical_name} PRIVATE _hypot=hypot) | target_compile_definitions(${_logical_name} PRIVATE _hypot=hypot) | |||
elseif(NOT MSVC) | elseif(NOT MSVC) | |||
# SIP v5+ redefines access to protected variables. | # SIP v5+ redefines access to protected variables. | |||
target_compile_definitions(${_logical_name} PRIVATE SIP_PROTECTED_IS _PUBLIC) | target_compile_definitions(${_logical_name} PRIVATE SIP_PROTECTED_IS _PUBLIC) | |||
target_compile_definitions(${_logical_name} PRIVATE protected=public ) | target_compile_definitions(${_logical_name} PRIVATE protected=public ) | |||
endif() | ||||
if(MSVC) | ||||
set_target_properties(${_logical_name} PROPERTIES PDB_NAME "sip_v5_$ | ||||
{_logical_name}") | ||||
endif () | endif () | |||
if (WIN32) | if (WIN32) | |||
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd") | SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd") | |||
ENDIF () | ENDIF () | |||
install(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_INS TALL_DIR}/${_parent_module_path}") | install(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_INS TALL_DIR}/${_parent_module_path}") | |||
endmacro() | endmacro() | |||
endif() | endif() | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 6 lines changed or added |