qmake: SCRIPT_PYTHON can be empty unless needed

Print an error from build.pro if SCRIPT_PYTHON not defined.
skyjake · Mar 10, 2012 · 07ff782 · 07ff782
1 parent 9fc3375
commit 07ff782
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/doomsday/build/build.pro b/doomsday/build/build.pro
@@ -54,6 +54,10 @@ deng_snowberry {
     # Make may not have yet created the output directory at this point.
     system(mkdir -p \"$$OUT_PWD\")
 
+    isEmpty(SCRIPT_PYTHON) {
+        error("Variable SCRIPT_PYTHON not set (path of Python interpreter to be used in generated scripts)")
+    }
+
     # Generate a script for starting the laucher.
     LAUNCH_FILE = launch-doomsday
     !system(sed \"s:PYTHON:$$SCRIPT_PYTHON:; s:SB_DIR:$$SB_DIR:\" \

diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -182,9 +182,6 @@ unix:!macx {
     isEmpty(SCRIPT_PYTHON) {
         # Check the system path.
         SCRIPT_PYTHON = $$system(which python)
-        isEmpty(SCRIPT_PYTHON) {
-            error("Variable SCRIPT_PYTHON not set (path of Python interpreter to be used in generated scripts)")
-        }
     }
 }