diff --git a/CMakeLists.txt b/CMakeLists.txt index ff0e7b174..3d96d21a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -335,7 +335,7 @@ if(UPNP) find_package(Miniupnpc) endif() find_package(Pnglite) -find_package(Python3) +find_package(PythonInterp 3) find_package(SDL2) if(VIDEORECORDER) find_package(FFMPEG) @@ -415,7 +415,7 @@ if(UPNP) show_dependency_status("Miniupnpc" MINIUPNPC) endif() show_dependency_status("Pnglite" PNGLITE) -show_dependency_status("PythonInterp" Python3_Interpreter) +show_dependency_status("PythonInterp" PYTHONINTERP) show_dependency_status("SDL2" SDL2) if(VIDEORECORDER) show_dependency_status("FFmpeg" FFMPEG) @@ -429,7 +429,7 @@ endif() if(CLIENT AND NOT(CURL_FOUND)) message(SEND_ERROR "You must install Curl to compile DDNet") endif() -if(NOT(Python3_Interpreter_FOUND)) +if(NOT(PYTHONINTERP_FOUND)) message(SEND_ERROR "You must install Python to compile DDNet") endif() @@ -591,7 +591,7 @@ file(COPY ${COPY_FILES} DESTINATION .) function(generate_source output_file script_parameter) add_custom_command(OUTPUT ${output_file} - COMMAND ${Python3_EXECUTABLE} datasrc/compile.py ${script_parameter} + COMMAND ${PYTHON_EXECUTABLE} datasrc/compile.py ${script_parameter} > "${PROJECT_BINARY_DIR}/${output_file}" DEPENDS datasrc/compile.py @@ -604,7 +604,7 @@ endfunction() function(generate_source7 output_file script_parameter) add_custom_command(OUTPUT ${output_file} - COMMAND ${Python3_EXECUTABLE} -m datasrc.seven.compile ${script_parameter} + COMMAND ${PYTHON_EXECUTABLE} -m datasrc.seven.compile ${script_parameter} > "${PROJECT_BINARY_DIR}/${output_file}" DEPENDS datasrc/seven/compile.py @@ -617,7 +617,7 @@ endfunction() function(generate_maps output_file) add_custom_command(OUTPUT ${output_file} - COMMAND ${Python3_EXECUTABLE} datasrc/crosscompile.py + COMMAND ${PYTHON_EXECUTABLE} datasrc/crosscompile.py > "${PROJECT_BINARY_DIR}/${output_file}" DEPENDS datasrc/compile.py @@ -646,7 +646,7 @@ if(NOT PROJECT_GIT_DIR_ERROR) ) endif() add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src/game/generated/git_revision.cpp - COMMAND ${Python3_EXECUTABLE} + COMMAND ${PYTHON_EXECUTABLE} scripts/git_revision.py > ${PROJECT_BINARY_DIR}/src/game/generated/git_revision.cpp WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} @@ -1627,7 +1627,7 @@ if(CLIENT AND (DMGTOOLS_FOUND OR HDIUTIL)) COMMAND ${CMAKE_COMMAND} -E copy $ $ ${DMG_TMPDIR}/${TARGET_SERVER}.app/Contents/MacOS/ # DMG - COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/dmg.py create ${DMG_PARAMS} ${CPACK_PACKAGE_FILE_NAME}.dmg ${CPACK_PACKAGE_FILE_NAME} ${DMG_TMPDIR} + COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/dmg.py create ${DMG_PARAMS} ${CPACK_PACKAGE_FILE_NAME}.dmg ${CPACK_PACKAGE_FILE_NAME} ${DMG_TMPDIR} DEPENDS ${TARGET_CLIENT}