1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve pro2cmake.py more

Browse Source 
Fix incorrect usage of CMAKE_CURRENT_BUILD_DIR, there is no such
CMake variable, it's actually CMAKE_CURRENT_BINARY_DIR.

Also if the host_build option is set when building a module,
the library should be a static library.

Change-Id: I9fb39905118dbd7f33d9821960eaed11f20b30c6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-06-07 18:13:53 +02:00
parent 38b1474c51
commit 44c9ad5617
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/cmake/pro2cmake.py
View File

@ -601,9 +601,9 @@ class Scope(object):
return ['${CMAKE_CURRENT_SOURCE_DIR}/' + os.path.relpath(self.currentdir, self.basedir),] return ['${CMAKE_CURRENT_SOURCE_DIR}/' + os.path.relpath(self.currentdir, self.basedir),]
if key == 'OUT_PWD': if key == 'OUT_PWD':
if is_same_path: if is_same_path:
return ['${CMAKE_CURRENT_BUILD_DIR}'] return ['${CMAKE_CURRENT_BINARY_DIR}']
else: else:
return ['${CMAKE_CURRENT_BUILD_DIR}/' + os.path.relpath(self.currentdir, self.basedir),] return ['${CMAKE_CURRENT_BINARY_DIR}/' + os.path.relpath(self.currentdir, self.basedir),]
return self._evalOps(key, None, [], inherrit=inherrit) return self._evalOps(key, None, [], inherrit=inherrit)
@ -1603,7 +1603,12 @@ def write_module(cm_fh: typing.IO[str], scope: Scope, *,
print('XXXXXX Module name {} does not start with Qt!'.format(module_name)) print('XXXXXX Module name {} does not start with Qt!'.format(module_name))
extra = [] extra = []
if 'static' in scope.get('CONFIG'):
# A module should be static when 'static' is in CONFIG
# or when option(host_build) is used, as described in qt_module.prf.
is_static = 'static' in scope.get('CONFIG') or 'host_build' in scope.get('_OPTION')
if is_static:
extra.append('STATIC') extra.append('STATIC')
if 'internal_module' in scope.get('CONFIG'): if 'internal_module' in scope.get('CONFIG'):
extra.append('INTERNAL_MODULE') extra.append('INTERNAL_MODULE')