ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename PYSIDE_INCLUDE_DIR to PYSIDE_INCLUDE_DIRS

Browse Source
This commit is contained in:
Anton Kochkov 2023-02-17 21:50:37 +08:00 committed by Anton Kochkov
parent aa40f69458
commit da7fc439db
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -111,10 +111,10 @@ if(CUTTER_ENABLE_PYTHON)
find_package(Shiboken6Tools "${Shiboken6_VERSION_REQUIRED}" REQUIRED) find_package(Shiboken6Tools "${Shiboken6_VERSION_REQUIRED}" REQUIRED)
find_package(PySide6 "${Shiboken6_VERSION_REQUIRED}" REQUIRED) find_package(PySide6 "${Shiboken6_VERSION_REQUIRED}" REQUIRED)
get_target_property(LIBSHIBOKEN_INCLUDE_DIRS Shiboken6::libshiboken INTERFACE_INCLUDE_DIRECTORIES) get_target_property(LIBSHIBOKEN_INCLUDE_DIRS Shiboken6::libshiboken INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(PYSIDE_INCLUDE_DIR PySide6::pyside6 INTERFACE_INCLUDE_DIRECTORIES) get_target_property(PYSIDE_INCLUDE_DIRS PySide6::pyside6 INTERFACE_INCLUDE_DIRECTORIES)
# Check the presence of "pysidecleanup.h" # Check the presence of "pysidecleanup.h"
include(CheckIncludeFileCXX) include(CheckIncludeFileCXX)
set(CMAKE_REQUIRED_INCLUDES "${PYSIDE_INCLUDE_DIR};${LIBSHIBOKEN_INCLUDE_DIRS}") set(CMAKE_REQUIRED_INCLUDES "${PYSIDE_INCLUDE_DIRS};${LIBSHIBOKEN_INCLUDE_DIRS}")
CHECK_INCLUDE_FILE_CXX("pysidecleanup.h" HAVE_PYSIDECLEANUP) CHECK_INCLUDE_FILE_CXX("pysidecleanup.h" HAVE_PYSIDECLEANUP)
add_compile_definitions("HAVE_PYSIDECLEANUP=${HAVE_PYSIDECLEANUP}") add_compile_definitions("HAVE_PYSIDECLEANUP=${HAVE_PYSIDECLEANUP}")
else() else()
@ -126,14 +126,15 @@ if(CUTTER_ENABLE_PYTHON)
endif() endif()
find_package(Shiboken2 "${Shiboken2_VERSION_REQUIRED}" REQUIRED) find_package(Shiboken2 "${Shiboken2_VERSION_REQUIRED}" REQUIRED)
find_package(PySide2 "${Shiboken2_VERSION_REQUIRED}" REQUIRED) find_package(PySide2 "${Shiboken2_VERSION_REQUIRED}" REQUIRED)
get_target_property(PYSIDE_INCLUDE_DIR PySide2::pyside2 INTERFACE_INCLUDE_DIRECTORIES) get_target_property(PYSIDE_INCLUDE_DIRS PySide2::pyside2 INTERFACE_INCLUDE_DIRECTORIES)
endif() endif()
list(GET PYSIDE_INCLUDE_DIR 0 PYSIDE_INCLUDE_DIR) foreach(_dir IN LISTS PYSIDE_INCLUDE_DIRS)
include_directories(${PYSIDE_INCLUDE_DIR} include_directories(${_dir}
${PYSIDE_INCLUDE_DIR}/QtCore ${_dir}/QtCore
${PYSIDE_INCLUDE_DIR}/QtGui ${_dir}/QtGui
${PYSIDE_INCLUDE_DIR}/QtWidgets) ${_dir}/QtWidgets)
endforeach()
add_definitions(-DCUTTER_ENABLE_PYTHON_BINDINGS) add_definitions(-DCUTTER_ENABLE_PYTHON_BINDINGS)
endif() endif()

2
cmake/FindPySide2.cmake
View File

@ -65,4 +65,4 @@ else()
INTERFACE_LINK_LIBRARIES "${PYSIDE_LIBRARY}") INTERFACE_LINK_LIBRARIES "${PYSIDE_LIBRARY}")
endif() endif()
mark_as_advanced(PYSIDE_INCLUDE_DIR PYSIDE_LIBRARY PYSIDE_BINARY) mark_as_advanced(PYSIDE_INCLUDE_DIR PYSIDE_LIBRARY PYSIDE_BINARY)