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

CMake: Replace QT_FEATURE_shared with BUILD_SHARED_LIBS

Browse Source 
Change-Id: I7f3efde01a98cd6a25de661624afbf7eda2c57af
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
This commit is contained in:
Tobias Hunger 2018-11-06 11:23:45 +01:00
parent 89368f5b26
commit df2975236d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.cmake
View File

@ -212,7 +212,7 @@ qt_feature("force_asserts" PUBLIC
) )
qt_feature("framework" PUBLIC qt_feature("framework" PUBLIC
LABEL "Build Apple Frameworks" LABEL "Build Apple Frameworks"
CONDITION APPLE AND QT_FEATURE_shared CONDITION APPLE AND BUILD_SHARED_LIBS
) )
qt_feature_definition("framework" "QT_MAC_FRAMEWORK_BUILD") qt_feature_definition("framework" "QT_MAC_FRAMEWORK_BUILD")
qt_feature("largefile" PUBLIC qt_feature("largefile" PUBLIC

1
util/cmake/configurejson2cmake.py
View File

@ -643,6 +643,7 @@ def parseFeature(ctx, feature, data, cm_fh):
'enable_gdb_index': None, 'enable_gdb_index': None,
'enable_new_dtags': None, 'enable_new_dtags': None,
'force_debug_info': None, 'force_debug_info': None,
'framework': { 'condition': 'APPLE AND BUILD_SHARED_LIBS', },
'gc_binaries': None, 'gc_binaries': None,
'gcc-sysroot': None, 'gcc-sysroot': None,
'gcov': None, 'gcov': None,