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

- 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

diff --git a/.github/actions/build-tinspector/action.yml b/.github/actions/build-tinspector/action.yml
index 18e93babe020a90eb6e4a312cd7b6934c98eb723..b035d2dcefe7a426e79cef7d6e0f2749fc67effc 100644 (file)
--- a/.github/actions/build-tinspector/action.yml
+++ b/.github/actions/build-tinspector/action.yml
@@ -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'

diff --git a/samples/CSharp/OCCTProxy/OCCTProxy.vcxproj b/samples/CSharp/OCCTProxy/OCCTProxy.vcxproj
index 26b8d1e7a6d86d829e0f5877af0c92d2213fb7df..7e3c0265d9359b689778c1257648bb7f9f0c4642 100644 (file)
--- a/samples/CSharp/OCCTProxy/OCCTProxy.vcxproj
+++ b/samples/CSharp/OCCTProxy/OCCTProxy.vcxproj
@@ -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>

diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj
index 78bac3cdefa2673d055e37c6e87898acffbd9563..ac8c560f6224467ae6d1f3d86c8e7596eeb07e6c 100644 (file)
--- a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj
+++ b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj
@@ -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>

diff --git a/samples/mfc/standard/01_Geometry/CMakeLists.txt b/samples/mfc/standard/01_Geometry/CMakeLists.txt
index 0e4a25598ef604871e55dad452955619f4d92b7c..ec58896cc725bfcaf1ae23ff35fd9d176842bdfc 100644 (file)
--- a/samples/mfc/standard/01_Geometry/CMakeLists.txt
+++ b/samples/mfc/standard/01_Geometry/CMakeLists.txt
@@ -90,4 +90,7 @@ include_directories (${CMAKE_BINARY_DIR}/inc
                      ${Geometry_RESOURCE_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
-target_link_libraries (Geometry mfcsample)
\ No newline at end of file
+target_link_libraries (Geometry mfcsample)
+
+set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
\ No newline at end of file

diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
index 57f44ff568def2c0cbc9683299fd04edf719a122..57586cc893ac2006ee1ee6b6644faaad7ff301d7 100644 (file)
--- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
@@ -577,4 +577,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <PropertyGroup>
+    <LanguageStandard>stdcpp17</LanguageStandard>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/samples/mfc/standard/02_Modeling/CMakeLists.txt b/samples/mfc/standard/02_Modeling/CMakeLists.txt
index 2cc6bb78bf82983ac46d59bcfb746f276d3c2572..1b8f78019a5c3f02d46ffc022dd2b0f108ce8c2c 100644 (file)
--- a/samples/mfc/standard/02_Modeling/CMakeLists.txt
+++ b/samples/mfc/standard/02_Modeling/CMakeLists.txt
@@ -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)

diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
index d55e3408007c9d39b298fc75a6d73f0264ce25b1..1f4aeaaaea8919025db1cbca46843879ba0ed376 100644 (file)
--- a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
@@ -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>

diff --git a/samples/mfc/standard/03_ImportExport/CMakeLists.txt b/samples/mfc/standard/03_ImportExport/CMakeLists.txt
index 46263e0e45baf1cf8ec4581e24f9a892fb599c19..a7dba8671b3ea13a5041e57023123b62b86214bf 100644 (file)
--- a/samples/mfc/standard/03_ImportExport/CMakeLists.txt
+++ b/samples/mfc/standard/03_ImportExport/CMakeLists.txt
@@ -59,4 +59,7 @@ include_directories (${CMAKE_BINARY_DIR}/inc
                      ${ImportExport_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
-target_link_libraries (ImportExport mfcsample)
\ No newline at end of file
+target_link_libraries (ImportExport mfcsample)
+
+set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
\ No newline at end of file

diff --git a/samples/mfc/standard/03_ImportExport/adm/win/vc10/ImportExport.vcxproj b/samples/mfc/standard/03_ImportExport/adm/win/vc10/ImportExport.vcxproj
index 66f3d764af5a763c61d0332044f7f369b39326a6..e8c9187b428c72fd235104a9286bf4066b7d16eb 100644 (file)
--- a/samples/mfc/standard/03_ImportExport/adm/win/vc10/ImportExport.vcxproj
+++ b/samples/mfc/standard/03_ImportExport/adm/win/vc10/ImportExport.vcxproj
@@ -353,4 +353,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <PropertyGroup>
+    <LanguageStandard>stdcpp17</LanguageStandard>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/samples/mfc/standard/04_HLR/CMakeLists.txt b/samples/mfc/standard/04_HLR/CMakeLists.txt
index 9b5e33b88ab172ca7ced5ae2be9ea12b972a75c5..1ccabc5b9e5ba9df8c110e54690aa87de84ba482 100644 (file)
--- a/samples/mfc/standard/04_HLR/CMakeLists.txt
+++ b/samples/mfc/standard/04_HLR/CMakeLists.txt
@@ -85,4 +85,7 @@ include_directories (${CMAKE_BINARY_DIR}/inc
                      ${HLR_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
-target_link_libraries (HLR mfcsample)
\ No newline at end of file
+target_link_libraries (HLR mfcsample)
+
+set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
\ No newline at end of file

diff --git a/samples/mfc/standard/04_HLR/adm/win/vc10/HLR.vcxproj b/samples/mfc/standard/04_HLR/adm/win/vc10/HLR.vcxproj
index 8bac1377195b3637c5b70e19ccd87ae9c8a95808..04c86a95aecfa0523dcf7b80583bc0962c17cd1f 100644 (file)
--- a/samples/mfc/standard/04_HLR/adm/win/vc10/HLR.vcxproj
+++ b/samples/mfc/standard/04_HLR/adm/win/vc10/HLR.vcxproj
@@ -410,4 +410,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <PropertyGroup>
+    <LanguageStandard>stdcpp17</LanguageStandard>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/samples/mfc/standard/mfcsample/CMakeLists.txt b/samples/mfc/standard/mfcsample/CMakeLists.txt
index 21e2ec40291a20c753765ee8cb383ccf9abe9023..67b2f55e63ebe9a1e4534a390840b465110e324e 100644 (file)
--- a/samples/mfc/standard/mfcsample/CMakeLists.txt
+++ b/samples/mfc/standard/mfcsample/CMakeLists.txt
@@ -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)

diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
index 9b75aed3fd699ecb98e45003b466c1a535d5a4f0..5157e9d5b7a156d3b91014240cdca7da76c21a7e 100644 (file)
--- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
@@ -699,4 +699,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <PropertyGroup>
+    <LanguageStandard>stdcpp17</LanguageStandard>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/samples/qt/AndroidQt/OCCT.pri b/samples/qt/AndroidQt/OCCT.pri
index c8773d3963c1cbd94b0a9d000b63c5194768707f..5e4976798a2fe0d60f5c84888fe4db1dfdec87e3 100644 (file)
--- a/samples/qt/AndroidQt/OCCT.pri
+++ b/samples/qt/AndroidQt/OCCT.pri
@@ -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

diff --git a/samples/qt/FuncDemo/FuncDemo.pro b/samples/qt/FuncDemo/FuncDemo.pro
index 3147a44ac3c231ce4a9b7c2b4171adbe3db466d3..dea4752c49e613fe2c3ddaebcd79c55e93dbcce2 100644 (file)
--- a/samples/qt/FuncDemo/FuncDemo.pro
+++ b/samples/qt/FuncDemo/FuncDemo.pro
@@ -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)
 }
 

diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro
index ed146e47aa8e5451d4ddfc0772b63a6841e4dc45..fe619bb65892d238b2eb7b3d7d44995b4381c710 100755 (executable)
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -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
 }

diff --git a/samples/qt/OCCTOverview/OCCTOverview.pro b/samples/qt/OCCTOverview/OCCTOverview.pro
index a8d0d1650af5e645f044e3bb969176152df09732..b75bab5f911d980f3466ef884f529c314f0f82b9 100644 (file)
--- a/samples/qt/OCCTOverview/OCCTOverview.pro
+++ b/samples/qt/OCCTOverview/OCCTOverview.pro
@@ -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
 }

diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro
index 9100db3409b485b8f8f210fd4293f8a4f5bd7cec..0ae8b2610a93fbe0d9f2cec629e34023b84ea7ee 100755 (executable)
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -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
 }