MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

Commit 5863d746 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas
Browse files

add BOTH_SWIG_SIP value for wrapping

parent 80311394
......@@ -20,7 +20,7 @@ else()
set(DTK_PYTHON_WRAPPER ${DTK_PYTHON_WRAPPER} CACHE STRING "dtk python wrapper")
endif()
set_property(CACHE DTK_PYTHON_WRAPPER PROPERTY STRINGS "SWIG" "SIP")
set_property(CACHE DTK_PYTHON_WRAPPER PROPERTY STRINGS "SWIG" "SIP" "BOTH_SWIG_SIP")
if(DTK_PYTHON_WRAPPER MATCHES "SIP")
if(APPLE)
......@@ -29,7 +29,9 @@ if(DTK_PYTHON_WRAPPER MATCHES "SIP")
set(PYQT5_MODULE_DIR "${SIP_DEFAULT_SIP_DIR}/PyQt5")
endif()
find_package(SIP)
else()
endif()
if(DTK_PYTHON_WRAPPER MATCHES "SWIG")
find_package(SWIG QUIET)
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment