diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-09-12 13:07:17 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-09-12 13:56:07 +0000 |
commit | 6eaffafe45e6c6ab495d4617069af6b36c7dcd50 (patch) | |
tree | 72fa2d3741107845b7657a5815cb764b8179c825 /setup.py | |
parent | 606f5ebacee8494764ed11aecb006c57027af4e0 (diff) |
setup.py: Fix checking for qmake/cmake binaries
Verify that the commands exist.
Change-Id: I8a4263320774f151848f68b04bc7b4447afe2579
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -190,16 +190,30 @@ if OPTION_QMAKE is None: OPTION_QMAKE = find_executable("qmake") QMAKE_COMMAND = None -if os.path.exists(OPTION_QMAKE): # Checking whether qmake executable exists +if OPTION_QMAKE is not None and os.path.exists(OPTION_QMAKE): # Checking whether qmake executable exists if os.path.islink(OPTION_QMAKE) and os.path.lexists(OPTION_QMAKE): # Looking whether qmake path is a link and whether the link exists if "qtchooser" in os.readlink(OPTION_QMAKE): # Set -qt=X here. QMAKE_COMMAND = [OPTION_QMAKE, "-qt=%s" %(OPTION_QT_VERSION)] if not QMAKE_COMMAND: QMAKE_COMMAND = [OPTION_QMAKE] +if len(QMAKE_COMMAND) == 0 or QMAKE_COMMAND[0] is None: + print("qmake could not be found.") + sys.exit(1) +if not os.path.exists(QMAKE_COMMAND[0]): + print("'%s' does not exist." % QMAKE_COMMAND[0]) + sys.exit(1) + if OPTION_CMAKE is None: OPTION_CMAKE = find_executable("cmake") +if OPTION_CMAKE is None: + print("cmake could not be found.") + sys.exit(1) +if not os.path.exists(OPTION_CMAKE): + print("'%s' does not exist." % OPTION_CMAKE) + sys.exit(1) + if sys.platform == "win32": if OPTION_MAKESPEC is None: OPTION_MAKESPEC = "msvc" |