AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ac611399fe
qt5base-lts/mkspecs/macx-clang-libc++/qmake.conf

23 lines
606 B
Plaintext
Raw Normal View History

mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32 Use these mkspecs to switch to the new libc++ C++ runtime library, which in turn makes it possible to enable C++11 support with clang. Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-06-13 11:37:14 +00:00
#
# qmake configuration for Clang on OS X
#
Deprecate Mac libc++ mkspecs We handle C++11 and libc++ through c++11.prf now, so separate mkspecs are not needed. Deprecating them allows us to remove them in a later release. Change-Id: I4e525f445aeab88c926fa62cedef6aa9b32a7f55 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-06-24 11:51:23 +00:00
warning("QMakespec macx-clang-libc++ is deprecated. Use macx-clang instead.")
Fix '=' alignment and replace tabs in *.conf (whitespace only change) Replace all tabs with proper space characters and consistently align the '=' characters. The default alignment for the '=' of 25 characters has been left as is to get a minimal diff. Lines with the '=' further to the right and those belonging to 'proper code (TM)' have not been touched. The work was mostly done using the following python script (might come in handy again...): import sys, re indent_eq = 25 + 0*4 # 25 characters was the most widely used indentation for the '=' character p = re.compile(r'(\w+)[ \t]*([\-\+]?)(=$|= )[ \t]*(.*$)') for fn in sys.argv[1:]: with open(fn, 'r+') as f: lines = [] nl_count = 0 continuity_indent = None for l in f: m = p.match(l) nl = l if m: n_spaces = max(m.start(3), indent_eq - 1) - len(m.group(2)) - len(m.group(1)) if m.group(2) and m.start(2) >= indent_eq-1 and m.start(2) % 4 == 0: n_spaces -= 1 # left-shift '+=' by one if the '+' is aligned to a multiple of 4 n_spaces = max(1, n_spaces) # we want at least one space before '='/'+=' nl = m.group(1) + ' '*n_spaces + ''.join(m.group(2,3,4)) + '\n' continuity_indent = nl.find('= ') + 2 if l[-2] == '\\' else None # remember indent on '\\$' elif continuity_indent: nl = ' '*continuity_indent + l.lstrip() if l[-2] != '\\': # check when to stop the continuation continuity_indent = None elif l.startswith('#'): nl = l.expandtabs(2) if l != nl: nl_count += 1 lines.append(nl) if nl_count > 0: print fn, nl_count, len(lines) f.seek(0) f.writelines(lines) f.truncate() Change-Id: I1d2870d0a2fe2e30d398c140fe523e69dd20c81b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-19 01:57:31 +00:00
MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32 Use these mkspecs to switch to the new libc++ C++ runtime library, which in turn makes it possible to enable C++11 support with clang. Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-06-13 11:37:14 +00:00
QMAKE_INCREMENTAL_STYLE = sublib
Rename common/mac.conf to common/macx.conf This is a step towards making mac a shared scope for both Mac OS X and iOS, while macx is Mac OS X specific and ios is iOS specific. We'll then move iOS to not include macx.conf, once we make the change to not have iOS imply macx. Change-Id: Ic9ce4d597873aa3cf2c981598354733e07db644d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2013-03-02 14:13:38 +00:00
include(../common/macx.conf)
Rename gcc-base-macx.conf to gcc-base-mac.conf and use it for iOS as well The only difference between the two is that iOS append @executable_path/ to QMAKE_LFLAGS_SONAME, but since shared libraries are not supported on iOS anyways, this is not really something we have to care about. Change-Id: I4797a4dfb94d9b3af03af22618351b98b48f8255 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2013-03-02 14:46:37 +00:00
include(../common/gcc-base-mac.conf)
mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32 Use these mkspecs to switch to the new libc++ C++ runtime library, which in turn makes it possible to enable C++11 support with clang. Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-06-13 11:37:14 +00:00
include(../common/clang.conf)
include(../common/clang-mac.conf)
Use sdk.prf to set macosx-version-min instead of static conf files Allows us to dynamically generate the command line option for iOS later, and allows the user to override QMAKE_MACOSX_DEPLOYMENT_TARGET with the expected effect on the command line options. We unset PERL5LIB to ensure we get the system Perl libraries, since the Mac OS 10.6 CI machine seems to have a broken XML::Parser::Expat from macports/CPAN. Change-Id: I04430c7b1daf9452d72f9a04a6b7f8d0d6926884 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-15 16:27:51 +00:00
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32 Use these mkspecs to switch to the new libc++ C++ runtime library, which in turn makes it possible to enable C++11 support with clang. Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-06-13 11:37:14 +00:00
QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
Fix '=' alignment and replace tabs in *.conf (whitespace only change) Replace all tabs with proper space characters and consistently align the '=' characters. The default alignment for the '=' of 25 characters has been left as is to get a minimal diff. Lines with the '=' further to the right and those belonging to 'proper code (TM)' have not been touched. The work was mostly done using the following python script (might come in handy again...): import sys, re indent_eq = 25 + 0*4 # 25 characters was the most widely used indentation for the '=' character p = re.compile(r'(\w+)[ \t]*([\-\+]?)(=$|= )[ \t]*(.*$)') for fn in sys.argv[1:]: with open(fn, 'r+') as f: lines = [] nl_count = 0 continuity_indent = None for l in f: m = p.match(l) nl = l if m: n_spaces = max(m.start(3), indent_eq - 1) - len(m.group(2)) - len(m.group(1)) if m.group(2) and m.start(2) >= indent_eq-1 and m.start(2) % 4 == 0: n_spaces -= 1 # left-shift '+=' by one if the '+' is aligned to a multiple of 4 n_spaces = max(1, n_spaces) # we want at least one space before '='/'+=' nl = m.group(1) + ' '*n_spaces + ''.join(m.group(2,3,4)) + '\n' continuity_indent = nl.find('= ') + 2 if l[-2] == '\\' else None # remember indent on '\\$' elif continuity_indent: nl = ' '*continuity_indent + l.lstrip() if l[-2] != '\\': # check when to stop the continuation continuity_indent = None elif l.startswith('#'): nl = l.expandtabs(2) if l != nl: nl_count += 1 lines.append(nl) if nl_count > 0: print fn, nl_count, len(lines) f.seek(0) f.writelines(lines) f.truncate() Change-Id: I1d2870d0a2fe2e30d398c140fe523e69dd20c81b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-19 01:57:31 +00:00
QMAKE_CXXFLAGS += -stdlib=libc++
QMAKE_LFLAGS += -stdlib=libc++
mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32 Use these mkspecs to switch to the new libc++ C++ runtime library, which in turn makes it possible to enable C++11 support with clang. Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-06-13 11:37:14 +00:00
load(qt_config)
Reference in New Issue Copy Permalink