Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to C++17 for SIP and Shiboken #135

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Switch to C++17 for SIP and Shiboken #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmake/shiboken_helper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ macro(_shiboken_generator_command VAR GLOBAL TYPESYSTEM INCLUDE_PATH BUILD_DIR)
set(${VAR} ${SHIBOKEN_BINARY}
--generatorSet=shiboken
--enable-pyside-extensions
-std=c++17
--include-paths=${INCLUDE_PATH_WITH_COLONS}${SHIBOKEN_HELPER_INCLUDE_DIRS_WITH_COLONS}
--typesystem-paths=${PYSIDE_TYPESYSTEMS}
--output-directory=${BUILD_DIR} ${GLOBAL} ${TYPESYSTEM})
Expand Down
6 changes: 3 additions & 3 deletions cmake/sip_configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,14 @@ def split_paths(paths):
# redirect location of generated library
makefile._target = '"%s"' % os.path.join(output_dir, makefile._target)

# Force c++14
# Force c++17
if sys.platform == 'win32':
makefile.extra_cxxflags.append('/std:c++14')
makefile.extra_cxxflags.append('/std:c++17')
# The __cplusplus flag is not properly set on Windows for backwards
# compatibilty. This flag sets it correctly
makefile.CXXFLAGS.append('/Zc:__cplusplus')
else:
makefile.extra_cxxflags.append('-std=c++14')
makefile.extra_cxxflags.append('-std=c++17')

# Finalise the Makefile, preparing it to be saved to disk
makefile.finalise()
Expand Down