OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-07-15 12:35:51 +03:00
Code

Testing - Update samples C++ version (#606)

Browse Source 
- Updating Qt project files to use C++17 standard instead of GNU++11
- Configuring Visual Studio project files to use C++17 language standard
- Setting CMake projects to require C++17 standard
This commit is contained in:
Pasukhin Dmitry 2025-07-12 15:44:22 +01:00 committed by GitHub
parent 5643d5c34a
commit 3d3a47a33a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/build-tinspector/action.yml vendored
View File

@ -45,7 +45,7 @@ runs:
run: |
git clone https://github.com/Open-Cascade-SAS/Inspector.git inspector
cd inspector
git checkout 6da9ba776ef72a17dca3331974df4200024c7f34
git checkout 0757c9bbe4d856a9cd26a62a453fc31879d9d054
- name: Configure TInspector - Windows
if: inputs.platform == 'windows'

3
samples/CSharp/OCCTProxy/OCCTProxy.vcxproj
View File

@ -79,6 +79,9 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup>
<LanguageStandard>stdcpp17</LanguageStandard>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>

3
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj
View File

@ -80,6 +80,9 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup>
<LanguageStandard>stdcpp17</LanguageStandard>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>

5
samples/mfc/standard/01_Geometry/CMakeLists.txt
View File

@ -90,4 +90,7 @@ include_directories (${CMAKE_BINARY_DIR}/inc
${Geometry_RESOURCE_DIR}
${MFC_STANDARD_SAMPLES_DIR}/Common)
target_link_libraries (Geometry mfcsample)
target_link_libraries (Geometry mfcsample)
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED ON)

3
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
View File

@ -577,4 +577,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<PropertyGroup>
<LanguageStandard>stdcpp17</LanguageStandard>
</PropertyGroup>
</Project>

3
samples/mfc/standard/02_Modeling/CMakeLists.txt
View File

@ -62,3 +62,6 @@ include_directories (${CMAKE_BINARY_DIR}/inc
${MFC_STANDARD_SAMPLES_DIR}/Common)
target_link_libraries (Modeling mfcsample TKDESTEP TKBO)
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED ON)

3
samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
View File

@ -83,6 +83,9 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup>
<LanguageStandard>stdcpp17</LanguageStandard>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

5
samples/mfc/standard/03_ImportExport/CMakeLists.txt
View File

@ -59,4 +59,7 @@ include_directories (${CMAKE_BINARY_DIR}/inc
${ImportExport_SRC_DIR}
${MFC_STANDARD_SAMPLES_DIR}/Common)
target_link_libraries (ImportExport mfcsample)
target_link_libraries (ImportExport mfcsample)
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED ON)

3
samples/mfc/standard/03_ImportExport/adm/win/vc10/ImportExport.vcxproj
View File

@ -353,4 +353,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<PropertyGroup>
<LanguageStandard>stdcpp17</LanguageStandard>
</PropertyGroup>
</Project>

5
samples/mfc/standard/04_HLR/CMakeLists.txt
View File

@ -85,4 +85,7 @@ include_directories (${CMAKE_BINARY_DIR}/inc
${HLR_SRC_DIR}
${MFC_STANDARD_SAMPLES_DIR}/Common)
target_link_libraries (HLR mfcsample)
target_link_libraries (HLR mfcsample)
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED ON)

3
samples/mfc/standard/04_HLR/adm/win/vc10/HLR.vcxproj
View File

@ -410,4 +410,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<PropertyGroup>
<LanguageStandard>stdcpp17</LanguageStandard>
</PropertyGroup>
</Project>

3
samples/mfc/standard/mfcsample/CMakeLists.txt
View File

@ -187,3 +187,6 @@ set (mfcsample_USED_LIBS TKDEVRML
${CSF_OpenGlLibs})
target_link_libraries (mfcsample ${mfcsample_USED_LIBS})
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED ON)

3
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
View File

@ -699,4 +699,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<PropertyGroup>
<LanguageStandard>stdcpp17</LanguageStandard>
</PropertyGroup>
</Project>

3
samples/qt/AndroidQt/OCCT.pri
View File

@ -15,11 +15,12 @@ occt_lib_path = $$_PRO_FILE_PWD_/occt/$$occt_lib_subpath
android {
QMAKE_CFLAGS += -fexceptions -Wno-ignored-qualifiers
QMAKE_CXXFLAGS += -fexceptions -Wno-ignored-qualifiers
QMAKE_CXXFLAGS += -fexceptions -Wno-ignored-qualifiers -std=c++17
LIBS += -L$$occt_lib_path -lEGL
}
win32 {
QMAKE_CXXFLAGS_WARN_ON += -W4
QMAKE_CXXFLAGS += /std:c++17
INCLUDEPATH += $$(CSF_OCCTIncludePath)
LIBS += -L$(CSF_OCCTLibPath);$(CSF_PRODLibPath)
LIBS += -lopengl32

3
samples/qt/FuncDemo/FuncDemo.pro
View File

@ -42,7 +42,7 @@ unix {
equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
!macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
QMAKE_CXXFLAGS += -std=gnu++11
QMAKE_CXXFLAGS += -std=c++17
}
win32 {
@ -57,6 +57,7 @@ win32 {
OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
MOC_DIR = ./src
}
QMAKE_CXXFLAGS += /std:c++17
LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
}

3
samples/qt/IESample/IESample.pro
View File

@ -56,7 +56,7 @@ unix {
!macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
LIBS += -lfreeimageplus
LIBS += -ltbb -ltbbmalloc
QMAKE_CXXFLAGS += -std=gnu++11
QMAKE_CXXFLAGS += -std=c++17
}
win32 {
@ -71,6 +71,7 @@ win32 {
OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc
}
QMAKE_CXXFLAGS += /std:c++17
LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
}

3
samples/qt/OCCTOverview/OCCTOverview.pro
View File

@ -59,7 +59,7 @@ unix {
DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
!macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
QMAKE_CXXFLAGS += -std=gnu++11
QMAKE_CXXFLAGS += -std=c++17
}
win32 {
@ -74,6 +74,7 @@ win32 {
OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc
}
QMAKE_CXXFLAGS += /std:c++17
LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
}

3
samples/qt/Tutorial/Tutorial.pro
View File

@ -57,7 +57,7 @@ unix {
equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
!macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
QMAKE_CXXFLAGS += -std=gnu++11
QMAKE_CXXFLAGS += -std=c++17
}
win32 {
@ -73,6 +73,7 @@ win32 {
MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc
}
LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
QMAKE_CXXFLAGS += /std:c++17
DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
}