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 5f9b9e5f authored by Julien Wintz's avatar Julien Wintz
Browse files

Concurrent python wrapping in progress.

parent 5863d746
......@@ -387,6 +387,7 @@ mark_as_advanced(dtk_VERSION_MAJOR)
mark_as_advanced(dtk_VERSION_MINOR)
mark_as_advanced(dtk_VERSION_BUILD)
mark_as_advanced(Qt5_DIR)
mark_as_advanced(Qt5Concurrent_DIR)
mark_as_advanced(Qt5Core_DIR)
mark_as_advanced(Qt5Gui_DIR)
......@@ -413,5 +414,7 @@ mark_as_advanced(DTK_ENABLE_MEMCHECK)
mark_as_advanced(DTK_COVERAGE_USE_COBERTURA)
mark_as_advanced(DTK_PYTHON_VERSION)
mark_as_advanced(CCACHE_FOUND)
######################################################################
### CMakeLists.txt ends here
......@@ -42,15 +42,7 @@ set(CMAKE_MODULE_PATH
set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "@CMAKE_BINARY_DIR@/dtkSetTestEnvironment.cmake")
find_package(Qt5 REQUIRED COMPONENTS
Core
Concurrent
Network
Quick
Svg
Test
Widgets
Xml)
find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Network Quick Svg Test Widgets Xml)
set(dtk_MODULE_PATH "@CMAKE_BINARY_DIR@")
set(dtk_INSTALL_DOCS @dtk_INSTALL_DOCS@)
......@@ -98,6 +90,8 @@ if(DTK_BUILD_SCRIPT)
endif(DTK_BUILD_SCRIPT)
if(DTK_BUILD_WRAPPERS)
set(SIP_FOUND @SIP_FOUND@)
set(SWIG_FOUND @SWIG_FOUND@)
set(DTK_PYTHON_WRAPPER @DTK_PYTHON_WRAPPER@)
set(DTK_WRAPPING_PYTHON @DTK_WRAPPING_PYTHON@)
set(DTK_WRAPPING_CSHARP @DTK_WRAPPING_CSHARP@)
......
......@@ -20,9 +20,9 @@ else()
set(DTK_PYTHON_WRAPPER ${DTK_PYTHON_WRAPPER} CACHE STRING "dtk python wrapper")
endif()
set_property(CACHE DTK_PYTHON_WRAPPER PROPERTY STRINGS "SWIG" "SIP" "BOTH_SWIG_SIP")
set_property(CACHE DTK_PYTHON_WRAPPER PROPERTY STRINGS "SWIG" "SIP" "BOTH")
if(DTK_PYTHON_WRAPPER MATCHES "SIP")
if(DTK_PYTHON_WRAPPER MATCHES "SIP" OR DTK_PYTHON_WRAPPER MATCHES "BOTH")
if(APPLE)
set(SIP_DEFAULT_SIP_DIR "/System/Library/Frameworks/Python.framework/Versions/2.7/share/sip")
set(SIP_MODULE_DIR ${SIP_DEFAULT_SIP_DIR})
......@@ -31,7 +31,7 @@ if(DTK_PYTHON_WRAPPER MATCHES "SIP")
find_package(SIP)
endif()
if(DTK_PYTHON_WRAPPER MATCHES "SWIG")
if(DTK_PYTHON_WRAPPER MATCHES "SWIG" OR DTK_PYTHON_WRAPPER MATCHES "BOTH")
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