SVN commit 1179540 by cfeck: Unbreak the build
I am not quite sure about all these Python related buildsystem changes, but commit r1179426 broke the build because of a missing argument to the ensure_version_range macro when PythonInterp is not found. This commit fixes that. Additionally, I seem to remember there was some discussion what to do (build/install) kajongg when runtime dependencies are not found, but I cannot remember the outcome. CCMAIL: [email protected] CCMAIL: [email protected] CCMAIL: [email protected] CCMAIL: [email protected] M +3 -1 CMakeLists.txt --- trunk/KDE/kdegames/CMakeLists.txt #1179539:1179540 @@ -21,8 +21,10 @@ macro_log_feature(OPENGL_FOUND "OpenGL" "API for developing portable, interactive 2D and 3Dgraphics applications" "http://mesa3d.sourceforge.net"; FALSE "" "Kubrick will not be built and KSudoku will not have Roxdoku support without OpenGL.") macro_log_feature(QT_QTOPENGL_FOUND "QtOpenGL" "Qt module that make it easy to use OpenGL in Qt apps" "http://doc.trolltech.com/latest/qtopengl.html"; FALSE "" "Kubrick will not be built and KSudoku will not have Roxdoku support without QtOpenGL.") -macro_optional_find_package(PYTHONINTERP) +macro_optional_find_package(PythonInterp) +if(${PYTHONINTERP_VERSION}) macro_ensure_version_range("2.6.0" ${PYTHONINTERP_VERSION} "3.0.0" PYTHON_KAJONGG) +endif(${PYTHONINTERP_VERSION}) macro_log_feature(PYTHON_KAJONGG "Python" "Programming language that lets you work more quickly and integrate your systems more effectively." "http://python.org"; FALSE "" "Kajongg will not be built without the python interpreter (version 2.6 < 3.0).") if(OPENGL_FOUND AND QT_QTOPENGL_FOUND) _______________________________________________ Kde-buildsystem mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-buildsystem
