mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-19 13:40:49 +03:00
0032921: Set C++11 standard for several projects.
Several projects depends on Qt library 0f 5.11.2 version. TKDFBrowser TKMessageView TKShapeView TKTInspector TInspectorEXE TKTreeModel TKMessageModel TKVInspector TKToolsDraw TKTInspectorAPI TKView When using C++20 language standard, compilation errors occures because of incompatibility of 5.11.2 version of Qt library interface with C++20 standard. Therefore, these projects stay on C++11 language standard.
This commit is contained in:
@@ -5,3 +5,8 @@ set (EXECUTABLE_PROJECT ON)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
unset (EXECUTABLE_PROJECT)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
@@ -3,3 +3,8 @@ project(TKDFBrowser)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
@@ -3,3 +3,8 @@ project(TKMessageModel)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
@@ -3,3 +3,8 @@ project(TKMessageView)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
@@ -3,3 +3,8 @@ project(TKShapeView)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
@@ -6,4 +6,9 @@ OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
||||
unset (INSTALL_API)
|
||||
|
@@ -6,5 +6,9 @@ OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
UNSET (TOOL_API_LIBRARY)
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
||||
UNSET (TOOL_API_LIBRARY)
|
||||
|
@@ -3,3 +3,8 @@ project(TKToolsDraw)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
@@ -3,3 +3,8 @@ project(TKTreeModel)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
@@ -3,3 +3,8 @@ project(TKVInspector)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
@@ -3,3 +3,8 @@ project(TKView)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
|
||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_tool)
|
||||
|
||||
# This project depends from Qt.
|
||||
# Qt 5.11.2 is incompatible with c++20.
|
||||
# So, it should be compiled with c++11/c++14 language standard.
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
|
Reference in New Issue
Block a user