diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-11-06 11:23:45 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-11-06 15:23:52 +0000 |
| commit | df2975236dcf522cf9f70097ac6fbfa467439664 (patch) | |
| tree | a0c2f21c7086d8b8aaca1237cff9fc69ac273ba4 | |
| parent | 89368f5b26b32501d70265259c67aa0f6794273d (diff) | |
CMake: Replace QT_FEATURE_shared with BUILD_SHARED_LIBS
Change-Id: I7f3efde01a98cd6a25de661624afbf7eda2c57af
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| -rw-r--r-- | configure.cmake | 2 | ||||
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index dc9fed82fe..2a8bbd336f 100644 --- a/configure.cmake +++ b/configure.cmake @@ -212,7 +212,7 @@ qt_feature("force_asserts" PUBLIC ) qt_feature("framework" PUBLIC 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("largefile" PUBLIC diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 0cd0f24e4d..27a72202d2 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -643,6 +643,7 @@ def parseFeature(ctx, feature, data, cm_fh): 'enable_gdb_index': None, 'enable_new_dtags': None, 'force_debug_info': None, + 'framework': { 'condition': 'APPLE AND BUILD_SHARED_LIBS', }, 'gc_binaries': None, 'gcc-sysroot': None, 'gcov': None, |