edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1353

Browse source 
1353: Revert "CMakeLists.txt: Replace PythonInterp with Python" r=Learath2 a=heinrich5991

This reverts commit c1523d9fc3.

Fixes #1352.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
This commit is contained in:
bors[bot] 2018-10-20 14:32:20 +00:00
parent 963cec6976 9ef200cd4a
commit d7072da916
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CMakeLists.txt
View file

@ -289,12 +289,7 @@ find_package(Ogg)
find_package(Opus)
find_package(Opusfile)
find_package(Pnglite)
find_package(Python COMPONENTS Interpreter)
if(NOT PYTHON_FOUND)
find_package(PythonInterp)
set(Python_EXECUTABLE "${PYTHON_EXECUTABLE}")
set(PYTHON_FOUND "${PYTHONINTERP_FOUND}")
endif()
find_package(PythonInterp)
find_package(SDL2)
find_package(Threads)
find_package(Wavpack)
@ -358,7 +353,7 @@ show_dependency_status("OpenSSL Crypto" CRYPTO)
show_dependency_status("Opus" OPUS)
show_dependency_status("Opusfile" OPUSFILE)
show_dependency_status("Pnglite" PNGLITE)
show_dependency_status("Python" PYTHON)
show_dependency_status("PythonInterp" PYTHONINTERP)
show_dependency_status("SDL2" SDL2)
show_dependency_status("Wavpack" WAVPACK)
show_dependency_status("Zlib" ZLIB)
@ -369,7 +364,7 @@ endif()
if(NOT(CURL_FOUND))
message(SEND_ERROR "You must install Curl to compile the DDNet")
endif()
if(NOT(PYTHON_FOUND))
if(NOT(PYTHONINTERP_FOUND))
message(SEND_ERROR "You must install Python to compile DDNet")
endif()
@ -522,7 +517,7 @@ file(COPY ${COPY_FILES} DESTINATION .)
function(generate_source output_file script_parameter)
add_custom_command(OUTPUT ${output_file}
COMMAND ${Python_EXECUTABLE} datasrc/compile.py ${script_parameter}
COMMAND ${PYTHON_EXECUTABLE} datasrc/compile.py ${script_parameter}
> "${PROJECT_BINARY_DIR}/${output_file}"
DEPENDS
datasrc/compile.py
@ -547,7 +542,7 @@ if(NOT PROJECT_GIT_DIR_ERROR)
)
endif()
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src/game/generated/git_revision.cpp
COMMAND ${Python_EXECUTABLE}
COMMAND ${PYTHON_EXECUTABLE}
scripts/git_revision.py
> ${PROJECT_BINARY_DIR}/src/game/generated/git_revision.cpp
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@ -1405,7 +1400,7 @@ if(CLIENT AND (DMGTOOLS_FOUND OR HDIUTIL))
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${TARGET_SERVER}> $<TARGET_FILE:${TARGET_SERVER_LAUNCHER}> ${DMG_TMPDIR}/${TARGET_SERVER}.app/Contents/MacOS/
# DMG
COMMAND ${Python_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}