mirror of
https://github.com/ModOrganizer2/cmake_common.git
synced 2026-07-27 14:06:46 -07:00
Python compatibility changes
* Add OpenGLWidgest as a req * Use res directory for qrc replacement
This commit is contained in:
@@ -16,6 +16,7 @@ macro(do_cpp_project)
|
||||
find_package(Qt6 COMPONENTS Qml REQUIRED)
|
||||
find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
|
||||
find_package(Qt6 COMPONENTS LinguistTools REQUIRED)
|
||||
find_package(Qt6 COMPONENTS OpenGLWidgets REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(Boost REQUIRED COMPONENTS thread)
|
||||
find_package(fmt REQUIRED)
|
||||
|
||||
@@ -40,7 +40,7 @@ macro(do_src)
|
||||
endif()
|
||||
|
||||
# resources in the src directory
|
||||
file(GLOB_RECURSE resources ${src_dir}/*.ui ${src_dir}/*.qrc)
|
||||
file(GLOB_RECURSE resources ${src_dir}/*.ui)
|
||||
|
||||
foreach(object ${resources})
|
||||
get_filename_component(ext "${object}" LAST_EXT)
|
||||
@@ -59,21 +59,6 @@ macro(do_src)
|
||||
"${object}"
|
||||
WORKING_DIRECTORY ${PYTHON_ROOT})
|
||||
|
||||
list(APPEND src_files "${output}")
|
||||
# elseif("${ext}" STREQUAL ".qrc")
|
||||
# # process .qrc files and copy the resulting .py in data
|
||||
# get_filename_component(name "${object}" NAME_WLE)
|
||||
# get_filename_component(folder "${object}" DIRECTORY)
|
||||
# set(output "${folder}/${name}.py")
|
||||
|
||||
# execute_process(
|
||||
# COMMAND ${PYTHON_ROOT}/PCbuild/amd64/python.exe
|
||||
# -I
|
||||
# -m PyQt6.pyrcc_main
|
||||
# -o "${output}"
|
||||
# "${object}"
|
||||
# WORKING_DIRECTORY ${PYTHON_ROOT})
|
||||
|
||||
list(APPEND src_files "${output}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
@@ -21,6 +21,18 @@ function(is_interesting_python_dir var dir)
|
||||
else()
|
||||
set(${var} TRUE PARENT_SCOPE)
|
||||
endif()
|
||||
|
||||
endfunction()
|
||||
|
||||
|
||||
# sets `var` to TRUE if resource directory
|
||||
#
|
||||
function(is_res_directory var dir)
|
||||
if(${dir} STREQUAL "res")
|
||||
set(${var} TRUE PARENT_SCOPE)
|
||||
else()
|
||||
set(${var} TRUE PARENT_SCOPE)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
|
||||
@@ -42,6 +54,10 @@ macro(do_src)
|
||||
if (${is_interesting})
|
||||
list(APPEND data_dirs "${object}")
|
||||
endif()
|
||||
is_res_directory(is_res "${object}")
|
||||
if (${is_res})
|
||||
list(APPEND res_dirs "${object}")
|
||||
endif()
|
||||
else()
|
||||
get_filename_component(ext "${object}" LAST_EXT)
|
||||
|
||||
@@ -98,4 +114,9 @@ macro(do_src)
|
||||
DIRECTORY ${data_dirs}
|
||||
DESTINATION ${install_dir}/data
|
||||
FILES_MATCHING PATTERN "*.py")
|
||||
|
||||
# directories that go in bin/plugins/data/res
|
||||
install(
|
||||
DIRECTORY ${res_dirs}
|
||||
DESTINATION ${install_dir}/data)
|
||||
endmacro()
|
||||
|
||||
Reference in New Issue
Block a user