diff --git a/CMakeLists.txt b/CMakeLists.txt index bf0a3d6b4..7d96a2452 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,6 +206,14 @@ configure_file( ${CMAKE_BINARY_DIR}/include/qtglobal.h ) +find_package(PythonInterp) +set_package_properties(PythonInterp PROPERTIES + PURPOSE "UI class maps generator script" + DESCRIPTION "Programming language that lets you work quickly" + URL "https://www.python.org/" + TYPE REQUIRED +) + find_package(OpenSSL) set_package_properties(OpenSSL PROPERTIES PURPOSE "Required for HTTPS support" diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 7fbafbdbf..7590de941 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -29,7 +29,7 @@ set(KATIE_QDBUSXML2CPP "qdbusxml2cpp") macro(KATIE_GENERATE_MAP SUBDIR KEYWORD) execute_process( - COMMAND ${CMAKE_SOURCE_DIR}/scripts/genmap.py ${SUBDIR} ${KEYWORD} + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/genmap.py ${SUBDIR} ${KEYWORD} WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE genmap_result ERROR_VARIABLE genmap_error diff --git a/scripts/genmap.py b/scripts/genmap.py index 6a578330c..6d5a5b083 100755 --- a/scripts/genmap.py +++ b/scripts/genmap.py @@ -29,4 +29,7 @@ mapdata += '\n#endif\n' sys.stderr.write('-- Writing: %s\n' % os.path.basename(mapoutput)) with open(mapoutput, 'wb') as f: - f.write(mapdata) \ No newline at end of file + if sys.version_info[0] == 3: + f.write(bytes(mapdata, 'utf-8')) + else: + f.write(mapdata) \ No newline at end of file