Skip to content

Commit

Permalink
Typesystem generation
Browse files Browse the repository at this point in the history
  • Loading branch information
troopa81 committed Nov 27, 2024
1 parent 7c65f3d commit c8d1de8
Show file tree
Hide file tree
Showing 18 changed files with 7,468 additions and 981 deletions.
20 changes: 9 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,7 @@ if(MSVC)
add_definitions(-DNOMINMAX)
endif()

set (WITH_PYSIDE FALSE CACHE BOOL "Enable (experimental) PySide support")
if (WITH_PYSIDE)

# Copied from git://code.qt.io/pyside/pyside-setup.git in shiboken6/cmake/ShibokenSetup.cmake
Expand Down Expand Up @@ -1027,6 +1028,9 @@ set(QGIS_INSTALL_SYS_LIBS TRUE CACHE BOOL "If set to TRUE install all required s
set(MIN_QGIS_PYTHON_VERSION "3.7")
set(Python_FIND_FRAMEWORK "LAST")

if (WITH_BINDINGS AND WITH_PYSIDE)
message(FATAL_ERROR "Cannot enable WITH_PYSIDE and WITH_BINDINGS together")
endif()

if (WITH_BINDINGS OR WITH_PYSIDE)
find_package(Python ${MIN_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development)
Expand All @@ -1038,17 +1042,6 @@ message("-- Found Python executable: ${Python_EXECUTABLE} (version ${Python_VERS
message("-- Python library: ${Python_LIBRARIES}")
message("-- Python site-packages: ${Python_SITEARCH}")

set (WITH_PYSIDE FALSE CACHE BOOL "Enable (experimental) PySide support")
if (WITH_PYSIDE)
if (WITH_BINDINGS)
message(FATAL_ERROR "Cannot enable WITH_PYSIDE and WITH_BINDINGS together")
endif()
set(PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/qt-for-python)
set(QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
add_subdirectory(qt-for-python)
add_subdirectory(python/testing)
endif()

if (WITH_CORE AND WITH_BINDINGS)
set(PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
set (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
Expand Down Expand Up @@ -1139,6 +1132,11 @@ if (WITH_CORE)

if (WITH_BINDINGS)
add_subdirectory(python)
elseif (WITH_PYSIDE)
set(PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/qt-for-python)
set(QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
add_subdirectory(qt-for-python)
add_subdirectory(python/testing)
endif()

if (APPLE)
Expand Down
Loading

0 comments on commit c8d1de8

Please sign in to comment.