diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-28 10:38:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-28 09:05:28 +0000 |
| commit | 826fe14dcbcf703e38a4b51b9f3ac3fcf948c53f (patch) | |
| tree | 67df25fccbfcedfe161bb5447dc676dc2e0ef058 | |
| parent | 547a61a433e2e035d8386c6534c1f86381e57cc7 (diff) | |
Shiboken: Set C++ 11 globally
Change-Id: I17634ebc245cae87819af16d79704326905e5783
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | sources/shiboken2/ApiExtractor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/shiboken2/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sources/shiboken2/libshiboken/CMakeLists.txt | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sources/shiboken2/ApiExtractor/CMakeLists.txt b/sources/shiboken2/ApiExtractor/CMakeLists.txt index 6cb3e0185..2b966aa56 100644 --- a/sources/shiboken2/ApiExtractor/CMakeLists.txt +++ b/sources/shiboken2/ApiExtractor/CMakeLists.txt @@ -82,8 +82,6 @@ target_link_libraries(apiextractor ${APIEXTRACTOR_EXTRA_LIBRARIES} ) -set_property(TARGET apiextractor PROPERTY CXX_STANDARD 11) - if (BUILD_TESTS) enable_testing() add_subdirectory(tests) diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt index ddba62df8..bb90283c5 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -197,6 +197,7 @@ else() endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_TO_ASCII") +set(CMAKE_CXX_STANDARD 11) set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) diff --git a/sources/shiboken2/libshiboken/CMakeLists.txt b/sources/shiboken2/libshiboken/CMakeLists.txt index e2e5eb427..1a5992bd0 100644 --- a/sources/shiboken2/libshiboken/CMakeLists.txt +++ b/sources/shiboken2/libshiboken/CMakeLists.txt @@ -39,7 +39,6 @@ target_link_libraries(libshiboken ${SBK_PYTHON_LIBRARIES}) set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken2${shiboken2_SUFFIX}${PYTHON_EXTENSION_SUFFIX}" VERSION ${libshiboken_VERSION} SOVERSION ${libshiboken_SOVERSION} - CXX_STANDARD 11 DEFINE_SYMBOL LIBSHIBOKEN_EXPORTS) install(FILES |