From e42a043abe0f1549840752d0986c20601121cb21 Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Fri, 25 Jul 2025 10:38:48 +0100 Subject: [PATCH] Samples - CMake configuration fix (#643) - Migrates legacy text-based FILES, PACKAGES, and EXTERNLIB configuration files to proper CMake format (.cmake extensions) - Updates CMakeLists.txt files to use modern CMake practices with explicit configurations and target-specific definitions - Modifies the qt_macro.cmake to work with the new CMake variable-based file management system --- CMakeLists.txt | 27 +++++-- adm/cmake/qt_macro.cmake | 32 +++++--- adm/templates/env.samples.sh.in | 2 +- adm/templates/sample.sh | 2 +- dox/samples/novice_guide.md | 2 +- samples/OCCTOverview/code/FILES | 48 ------------ samples/qt/AndroidQt/CMakeLists.txt | 13 +++- samples/qt/AndroidQt/EXTERNLIB | 17 ----- samples/qt/AndroidQt/EXTERNLIB.cmake | 20 +++++ samples/qt/AndroidQt/FILES | 2 - samples/qt/AndroidQt/FILES.cmake | 14 ++++ samples/qt/AndroidQt/PACKAGES | 1 - samples/qt/AndroidQt/PACKAGES.cmake | 4 + samples/qt/AndroidQt/src/FILES | 9 --- samples/qt/Common/src/FILES | 17 ----- samples/qt/FuncDemo/CMakeLists.txt | 10 ++- samples/qt/FuncDemo/EXTERNLIB | 14 ---- samples/qt/FuncDemo/EXTERNLIB.cmake | 17 +++++ samples/qt/FuncDemo/FILES | 2 - samples/qt/FuncDemo/FILES.cmake | 33 ++++++++ samples/qt/FuncDemo/PACKAGES | 1 - samples/qt/FuncDemo/PACKAGES.cmake | 4 + samples/qt/FuncDemo/src/FILES | 28 ------- samples/qt/IESample/CMakeLists.txt | 13 +++- samples/qt/IESample/EXTERNLIB | 26 ------- samples/qt/IESample/EXTERNLIB.cmake | 28 +++++++ samples/qt/IESample/FILES | 2 - samples/qt/IESample/FILES.cmake | 29 +++++++ samples/qt/IESample/PACKAGES | 3 - samples/qt/IESample/PACKAGES.cmake | 4 + samples/qt/IESample/src/FILES | 1 - samples/qt/Interface/src/FILES | 6 -- samples/qt/OCCTOverview/.DS_Store | Bin 0 -> 8196 bytes samples/qt/OCCTOverview/CMakeLists.txt | 18 ++++- samples/qt/OCCTOverview/EXTERNLIB | 30 -------- samples/qt/OCCTOverview/EXTERNLIB.cmake | 33 ++++++++ samples/qt/OCCTOverview/FILES | 2 - samples/qt/OCCTOverview/FILES.cmake | 72 ++++++++++++++++++ samples/qt/OCCTOverview/OCCTOverview.pro | 8 +- samples/qt/OCCTOverview/PACKAGES | 2 - samples/qt/OCCTOverview/PACKAGES.cmake | 4 + .../OCCTOverview/code/AdaptorCurve2d_AIS.cxx | 0 .../OCCTOverview/code/AdaptorCurve2d_AIS.h | 0 .../OCCTOverview/code/AdaptorCurve_AIS.cxx | 0 .../OCCTOverview/code/AdaptorCurve_AIS.h | 0 .../OCCTOverview/code/AdaptorPnt2d_AIS.cxx | 0 .../OCCTOverview/code/AdaptorPnt2d_AIS.h | 0 .../OCCTOverview/code/AdaptorVec_AIS.cxx | 0 .../OCCTOverview/code/AdaptorVec_AIS.h | 0 .../{ => qt}/OCCTOverview/code/BaseSample.cxx | 0 .../{ => qt}/OCCTOverview/code/BaseSample.h | 0 .../OCCTOverview/code/DataExchange.xml | 0 .../OCCTOverview/code/DataExchangeSamples.cxx | 0 .../OCCTOverview/code/DataExchangeSamples.h | 0 .../{ => qt}/OCCTOverview/code/Geometry.xml | 0 .../OCCTOverview/code/GeometrySamples.cxx | 0 .../OCCTOverview/code/GeometrySamples.h | 0 .../{ => qt}/OCCTOverview/code/MakeBottle.cxx | 0 .../{ => qt}/OCCTOverview/code/MakeBottle.h | 0 samples/{ => qt}/OCCTOverview/code/Ocaf.xml | 0 .../OCCTOverview/code/OcafSamples.cxx | 0 .../{ => qt}/OCCTOverview/code/OcafSamples.h | 0 .../OCCTOverview/code/Sample2D_Face.cxx | 0 .../OCCTOverview/code/Sample2D_Face.h | 0 .../OCCTOverview/code/Sample2D_Image.cxx | 0 .../OCCTOverview/code/Sample2D_Image.h | 0 .../OCCTOverview/code/Sample2D_Markers.cxx | 0 .../OCCTOverview/code/Sample2D_Markers.h | 0 .../{ => qt}/OCCTOverview/code/Samples.qrc | 0 .../code/TOcafFunction_BoxDriver.cxx | 0 .../code/TOcafFunction_BoxDriver.h | 0 .../code/TOcafFunction_CutDriver.cxx | 0 .../code/TOcafFunction_CutDriver.h | 0 .../code/TOcafFunction_CylDriver.cxx | 0 .../code/TOcafFunction_CylDriver.h | 0 .../OCCTOverview/code/TOcaf_Application.cxx | 0 .../OCCTOverview/code/TOcaf_Application.h | 0 .../{ => qt}/OCCTOverview/code/Topology.xml | 0 .../OCCTOverview/code/TopologySamples.cxx | 0 .../OCCTOverview/code/TopologySamples.h | 0 .../OCCTOverview/code/Triangulation.xml | 0 .../code/TriangulationSamples.cxx | 0 .../OCCTOverview/code/TriangulationSamples.h | 0 .../{ => qt}/OCCTOverview/code/Viewer2d.xml | 0 .../OCCTOverview/code/Viewer2dSamples.cxx | 0 .../OCCTOverview/code/Viewer2dSamples.h | 0 .../{ => qt}/OCCTOverview/code/Viewer3d.xml | 0 .../OCCTOverview/code/Viewer3dSamples.cxx | 0 .../OCCTOverview/code/Viewer3dSamples.h | 0 .../qt/OCCTOverview/src/ApplicationCommon.cxx | 2 +- samples/qt/OCCTOverview/src/FILES | 19 ----- samples/qt/Tutorial/CMakeLists.txt | 13 +++- samples/qt/Tutorial/EXTERNLIB | 26 ------- samples/qt/Tutorial/EXTERNLIB.cmake | 28 +++++++ samples/qt/Tutorial/FILES | 2 - samples/qt/Tutorial/FILES.cmake | 36 +++++++++ samples/qt/Tutorial/PACKAGES | 2 - samples/qt/Tutorial/PACKAGES.cmake | 4 + samples/qt/Tutorial/src/FILES | 8 -- 99 files changed, 432 insertions(+), 308 deletions(-) delete mode 100644 samples/OCCTOverview/code/FILES delete mode 100644 samples/qt/AndroidQt/EXTERNLIB create mode 100644 samples/qt/AndroidQt/EXTERNLIB.cmake delete mode 100644 samples/qt/AndroidQt/FILES create mode 100644 samples/qt/AndroidQt/FILES.cmake delete mode 100644 samples/qt/AndroidQt/PACKAGES create mode 100644 samples/qt/AndroidQt/PACKAGES.cmake delete mode 100644 samples/qt/AndroidQt/src/FILES delete mode 100644 samples/qt/Common/src/FILES delete mode 100644 samples/qt/FuncDemo/EXTERNLIB create mode 100644 samples/qt/FuncDemo/EXTERNLIB.cmake delete mode 100644 samples/qt/FuncDemo/FILES create mode 100644 samples/qt/FuncDemo/FILES.cmake delete mode 100644 samples/qt/FuncDemo/PACKAGES create mode 100644 samples/qt/FuncDemo/PACKAGES.cmake delete mode 100644 samples/qt/FuncDemo/src/FILES delete mode 100644 samples/qt/IESample/EXTERNLIB create mode 100644 samples/qt/IESample/EXTERNLIB.cmake delete mode 100644 samples/qt/IESample/FILES create mode 100644 samples/qt/IESample/FILES.cmake delete mode 100644 samples/qt/IESample/PACKAGES create mode 100644 samples/qt/IESample/PACKAGES.cmake delete mode 100644 samples/qt/IESample/src/FILES delete mode 100644 samples/qt/Interface/src/FILES create mode 100644 samples/qt/OCCTOverview/.DS_Store delete mode 100644 samples/qt/OCCTOverview/EXTERNLIB create mode 100644 samples/qt/OCCTOverview/EXTERNLIB.cmake delete mode 100644 samples/qt/OCCTOverview/FILES create mode 100644 samples/qt/OCCTOverview/FILES.cmake delete mode 100644 samples/qt/OCCTOverview/PACKAGES create mode 100644 samples/qt/OCCTOverview/PACKAGES.cmake rename samples/{ => qt}/OCCTOverview/code/AdaptorCurve2d_AIS.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/AdaptorCurve2d_AIS.h (100%) rename samples/{ => qt}/OCCTOverview/code/AdaptorCurve_AIS.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/AdaptorCurve_AIS.h (100%) rename samples/{ => qt}/OCCTOverview/code/AdaptorPnt2d_AIS.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/AdaptorPnt2d_AIS.h (100%) rename samples/{ => qt}/OCCTOverview/code/AdaptorVec_AIS.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/AdaptorVec_AIS.h (100%) rename samples/{ => qt}/OCCTOverview/code/BaseSample.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/BaseSample.h (100%) rename samples/{ => qt}/OCCTOverview/code/DataExchange.xml (100%) rename samples/{ => qt}/OCCTOverview/code/DataExchangeSamples.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/DataExchangeSamples.h (100%) rename samples/{ => qt}/OCCTOverview/code/Geometry.xml (100%) rename samples/{ => qt}/OCCTOverview/code/GeometrySamples.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/GeometrySamples.h (100%) rename samples/{ => qt}/OCCTOverview/code/MakeBottle.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/MakeBottle.h (100%) rename samples/{ => qt}/OCCTOverview/code/Ocaf.xml (100%) rename samples/{ => qt}/OCCTOverview/code/OcafSamples.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/OcafSamples.h (100%) rename samples/{ => qt}/OCCTOverview/code/Sample2D_Face.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/Sample2D_Face.h (100%) rename samples/{ => qt}/OCCTOverview/code/Sample2D_Image.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/Sample2D_Image.h (100%) rename samples/{ => qt}/OCCTOverview/code/Sample2D_Markers.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/Sample2D_Markers.h (100%) rename samples/{ => qt}/OCCTOverview/code/Samples.qrc (100%) rename samples/{ => qt}/OCCTOverview/code/TOcafFunction_BoxDriver.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/TOcafFunction_BoxDriver.h (100%) rename samples/{ => qt}/OCCTOverview/code/TOcafFunction_CutDriver.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/TOcafFunction_CutDriver.h (100%) rename samples/{ => qt}/OCCTOverview/code/TOcafFunction_CylDriver.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/TOcafFunction_CylDriver.h (100%) rename samples/{ => qt}/OCCTOverview/code/TOcaf_Application.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/TOcaf_Application.h (100%) rename samples/{ => qt}/OCCTOverview/code/Topology.xml (100%) rename samples/{ => qt}/OCCTOverview/code/TopologySamples.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/TopologySamples.h (100%) rename samples/{ => qt}/OCCTOverview/code/Triangulation.xml (100%) rename samples/{ => qt}/OCCTOverview/code/TriangulationSamples.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/TriangulationSamples.h (100%) rename samples/{ => qt}/OCCTOverview/code/Viewer2d.xml (100%) rename samples/{ => qt}/OCCTOverview/code/Viewer2dSamples.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/Viewer2dSamples.h (100%) rename samples/{ => qt}/OCCTOverview/code/Viewer3d.xml (100%) rename samples/{ => qt}/OCCTOverview/code/Viewer3dSamples.cxx (100%) rename samples/{ => qt}/OCCTOverview/code/Viewer3dSamples.h (100%) delete mode 100644 samples/qt/OCCTOverview/src/FILES delete mode 100644 samples/qt/Tutorial/EXTERNLIB create mode 100644 samples/qt/Tutorial/EXTERNLIB.cmake delete mode 100644 samples/qt/Tutorial/FILES create mode 100644 samples/qt/Tutorial/FILES.cmake delete mode 100644 samples/qt/Tutorial/PACKAGES create mode 100644 samples/qt/Tutorial/PACKAGES.cmake delete mode 100644 samples/qt/Tutorial/src/FILES diff --git a/CMakeLists.txt b/CMakeLists.txt index b1b6e962f3..74ba8ff1df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1174,7 +1174,6 @@ if (INSTALL_SAMPLES) OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_DIR_SAMPLES}") OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_DIR_SAMPLES}") OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_DIR_SAMPLES}") - OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code" "${INSTALL_DIR_SAMPLES}/OCCTOverview") install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/FuncDemo" RENAME "env.${SCRIPT_EXT}") install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/IESample" RENAME "env.${SCRIPT_EXT}") @@ -1403,13 +1402,13 @@ if (BUILD_SAMPLES_QT) endforeach() ## Copy sources of OCCTOverview for using in the sample - OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/DataExchangeSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") - OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/OcafSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") - OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/GeometrySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") - OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/TopologySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") - OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/TriangulationSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") - OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer2dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") - OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer3dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") + OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/DataExchangeSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") + OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/OcafSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") + OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/GeometrySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") + OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/TopologySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") + OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/TriangulationSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") + OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/Viewer2dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") + OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/Viewer3dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code") endif() @@ -1488,6 +1487,18 @@ endif() OCCT_MODULES_AND_TOOLKITS (SAMPLES "SAMPLES_TOOLKITS" OCCT_SAMPLES) +# Load sample configuration files +foreach (OCCT_SAMPLE ${OCCT_SAMPLES}) + foreach (BUILD_SAMPLE_TOOLKIT ${${OCCT_SAMPLE}_SAMPLES_TOOLKITS}) + OCCT_INCLUDE_CMAKE_FILE (samples/${OCCT_SAMPLE}/${BUILD_SAMPLE_TOOLKIT}/PACKAGES) + OCCT_INCLUDE_CMAKE_FILE (samples/${OCCT_SAMPLE}/${BUILD_SAMPLE_TOOLKIT}/EXTERNLIB) + OCCT_INCLUDE_CMAKE_FILE (samples/${OCCT_SAMPLE}/${BUILD_SAMPLE_TOOLKIT}/FILES) + foreach (PACKAGE ${OCCT_${BUILD_SAMPLE_TOOLKIT}_LIST_OF_PACKAGES}) + OCCT_INCLUDE_CMAKE_FILE (samples/${OCCT_SAMPLE}/${PACKAGE}/FILES) + endforeach() + endforeach() +endforeach() + if (BUILD_SAMPLES_QT) if (BUILD_SAMPLES_QT) if (NOT Qt5_FOUND OR "${Qt5Gui_EGL_INCLUDE_DIRS}" STREQUAL "" OR NOT WIN32) diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake index 36aec9086f..5c1824b0a0 100644 --- a/adm/cmake/qt_macro.cmake +++ b/adm/cmake/qt_macro.cmake @@ -79,8 +79,24 @@ macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES) endmacro() macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES) - file (STRINGS "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" TS_FILES REGEX ".+[.]ts") - file (STRINGS "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" QRC_FILES REGEX ".+[.]qrc") + # Package name is now the sample name (e.g., "Tutorial") + set(PACKAGE_NAME ${OCCT_PACKAGE}) + + # Get files from CMAKE variables with proper location + set(ALL_FILES ${OCCT_${PACKAGE_NAME}_FILES}) + set(FILES_LOCATION ${OCCT_${PACKAGE_NAME}_FILES_LOCATION}) + + # Filter for .ts and .qrc files with full paths + set(TS_FILES) + set(QRC_FILES) + foreach(FILE ${ALL_FILES}) + if(FILE MATCHES ".+[.]ts$") + list(APPEND TS_FILES "${FILES_LOCATION}/${FILE}") + endif() + if(FILE MATCHES ".+[.]qrc$") + list(APPEND QRC_FILES "${FILES_LOCATION}/${FILE}") + endif() + endforeach() string (FIND "${OCCT_PACKAGE}" "/" _index) if (_index GREATER -1) @@ -92,19 +108,17 @@ macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES) #message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}") foreach (QRC_FILE ${QRC_FILES}) - set (QRC_FILE_RELATIVE "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}") - if (EXISTS ${QRC_FILE_RELATIVE}) - FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES) + if (EXISTS ${QRC_FILE}) + FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE} RCC_FILES) list (APPEND ${RESOURCE_FILES} "${RCC_FILES}") endif() endforeach() #message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}") foreach (TS_FILE ${TS_FILES}) - set (TS_FILE_RELATIVE "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${TS_FILE}") - FIND_AND_WRAP_TS_FILE(${TS_FILE_RELATIVE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES) - if (EXISTS ${TS_FILE_RELATIVE}) - list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}") + FIND_AND_WRAP_TS_FILE(${TS_FILE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES) + if (EXISTS ${TS_FILE}) + list (APPEND ${RESOURCE_FILES} "${TS_FILE}") list (APPEND ${RESOURCE_FILES} "${QM_FILES}") endif() endforeach() diff --git a/adm/templates/env.samples.sh.in b/adm/templates/env.samples.sh.in index dddd137f21..08db608092 100644 --- a/adm/templates/env.samples.sh.in +++ b/adm/templates/env.samples.sh.in @@ -21,4 +21,4 @@ export RES_DIR=${aSamplePath}/${STATION}/res export PATH=${QTDIR}/bin:${PATH} -export "CSF_OCCTOverviewSampleCodePath=${aSamplePath}/../../OCCTOverview/code" +export "CSF_OCCTOverviewSampleCodePath=${aSamplePath}/../../qt/OCCTOverview/code" diff --git a/adm/templates/sample.sh b/adm/templates/sample.sh index 5ed26b9418..65647576a7 100644 --- a/adm/templates/sample.sh +++ b/adm/templates/sample.sh @@ -32,7 +32,7 @@ if [ ! -f "$EXE_PATH" ]; then exit 1 fi -export CSF_OCCTOverviewSampleCodePath="${CSF_OCCTSamplesPath}/OCCTOverview/code" +export CSF_OCCTOverviewSampleCodePath="${CSF_OCCTSamplesPath}/qt/OCCTOverview/code" cd ${aCurrentPath} "$EXE_PATH" diff --git a/dox/samples/novice_guide.md b/dox/samples/novice_guide.md index 9818c843a6..fc4c90b8b7 100644 --- a/dox/samples/novice_guide.md +++ b/dox/samples/novice_guide.md @@ -95,7 +95,7 @@ In addition to these two samples, there are much more that might be of use to a Check Readme files in the sample directories to learn more about samples compilation. **Note:** source code for OCCTOverview is stored at 'samples/qt/OCCTOverview/src' folder in your OCCT root, -and the source code files for examples presented in subsections are stored at 'samples/OCCTOverview/code folder'. +and the source code files for examples presented in subsections are stored at 'samples/qt/OCCTOverview/code folder'. Several utility classes that are not presented in the example window may be found in example source code files. The overall classes introduction may be found in the @ref occt_user_guides__foundation_classes "Foundation Classes" section of the documentation. diff --git a/samples/OCCTOverview/code/FILES b/samples/OCCTOverview/code/FILES deleted file mode 100644 index 342bae1275..0000000000 --- a/samples/OCCTOverview/code/FILES +++ /dev/null @@ -1,48 +0,0 @@ -AdaptorCurve2d_AIS.cxx -AdaptorCurve2d_AIS.h -AdaptorCurve_AIS.cxx -AdaptorCurve_AIS.h -AdaptorPnt2d_AIS.cxx -AdaptorPnt2d_AIS.h -AdaptorVec_AIS.cxx -AdaptorVec_AIS.h -BaseSample.cxx -BaseSample.h -DataExchange.xml -DataExchangeSamples.cxx -DataExchangeSamples.h -Geometry.xml -GeometrySamples.cxx -GeometrySamples.h -MakeBottle.cxx -MakeBottle.h -Ocaf.xml -OcafSamples.cxx -OcafSamples.h -Sample2D_Face.cxx -Sample2D_Face.h -Sample2D_Image.cxx -Sample2D_Image.h -Sample2D_Markers.cxx -Sample2D_Markers.h -Samples.qrc -TOcafFunction_BoxDriver.cxx -TOcafFunction_BoxDriver.h -TOcafFunction_CutDriver.cxx -TOcafFunction_CutDriver.h -TOcafFunction_CylDriver.cxx -TOcafFunction_CylDriver.h -TOcaf_Application.cxx -TOcaf_Application.h -Topology.xml -TopologySamples.cxx -TopologySamples.h -Triangulation.xml -TriangulationSamples.cxx -TriangulationSamples.h -Viewer2d.xml -Viewer2dSamples.cxx -Viewer2dSamples.h -Viewer3d.xml -Viewer3dSamples.cxx -Viewer3dSamples.h diff --git a/samples/qt/AndroidQt/CMakeLists.txt b/samples/qt/AndroidQt/CMakeLists.txt index 126582e8e2..ba43a22a39 100644 --- a/samples/qt/AndroidQt/CMakeLists.txt +++ b/samples/qt/AndroidQt/CMakeLists.txt @@ -1,9 +1,16 @@ project(AndroidQt) -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample) +# Sample configuration +set (EXECUTABLE_PROJECT ON) +set (USE_QT ON) +set (RELATIVE_DIR "samples/qt") +set (TARGET_FOLDER "Samples") + +include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}") + OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample) -ADD_DEFINITIONS(-DNO_Common_EXPORTS) +# Target-specific definitions +target_compile_definitions(AndroidQt PRIVATE -DNO_Common_EXPORTS) diff --git a/samples/qt/AndroidQt/EXTERNLIB b/samples/qt/AndroidQt/EXTERNLIB deleted file mode 100644 index fb5edc8d1d..0000000000 --- a/samples/qt/AndroidQt/EXTERNLIB +++ /dev/null @@ -1,17 +0,0 @@ -TKernel -TKMath -TKG2d -TKG3d -TKGeomBase -TKBRep -TKGeomAlgo -TKTopAlgo -TKShHealing -TKService -TKMesh -TKHLR -TKV3d -TKOpenGl -CSF_FreeImagePlus -CSF_FREETYPE -CSF_OpenGlLibs diff --git a/samples/qt/AndroidQt/EXTERNLIB.cmake b/samples/qt/AndroidQt/EXTERNLIB.cmake new file mode 100644 index 0000000000..e69a75f041 --- /dev/null +++ b/samples/qt/AndroidQt/EXTERNLIB.cmake @@ -0,0 +1,20 @@ +# External dependencies for AndroidQt sample +set(OCCT_AndroidQt_EXTERNAL_LIBS + TKernel + TKMath + TKG2d + TKG3d + TKGeomBase + TKBRep + TKGeomAlgo + TKTopAlgo + TKShHealing + TKService + TKMesh + TKHLR + TKV3d + TKOpenGl + CSF_FreeImagePlus + CSF_FREETYPE + CSF_OpenGlLibs +) \ No newline at end of file diff --git a/samples/qt/AndroidQt/FILES b/samples/qt/AndroidQt/FILES deleted file mode 100644 index ca4f0e567b..0000000000 --- a/samples/qt/AndroidQt/FILES +++ /dev/null @@ -1,2 +0,0 @@ -EXTERNLIB -PACKAGES diff --git a/samples/qt/AndroidQt/FILES.cmake b/samples/qt/AndroidQt/FILES.cmake new file mode 100644 index 0000000000..71d1823196 --- /dev/null +++ b/samples/qt/AndroidQt/FILES.cmake @@ -0,0 +1,14 @@ +# Source files for AndroidQt sample +set(OCCT_AndroidQt_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}") + +set(OCCT_AndroidQt_FILES + src/AndroidQt.cxx + src/AndroidQt.h + src/AndroidQt.qrc + src/AndroidQt_TouchParameters.cxx + src/AndroidQt_TouchParameters.h + src/AndroidQt_UserInteractionParameters.h + src/AndroidQt_Window.cxx + src/AndroidQt_Window.h + src/Main.cxx +) \ No newline at end of file diff --git a/samples/qt/AndroidQt/PACKAGES b/samples/qt/AndroidQt/PACKAGES deleted file mode 100644 index 089247b96e..0000000000 --- a/samples/qt/AndroidQt/PACKAGES +++ /dev/null @@ -1 +0,0 @@ -AndroidQt/src diff --git a/samples/qt/AndroidQt/PACKAGES.cmake b/samples/qt/AndroidQt/PACKAGES.cmake new file mode 100644 index 0000000000..68a4cffcbe --- /dev/null +++ b/samples/qt/AndroidQt/PACKAGES.cmake @@ -0,0 +1,4 @@ +# Packages for AndroidQt sample +set(OCCT_AndroidQt_LIST_OF_PACKAGES + AndroidQt +) \ No newline at end of file diff --git a/samples/qt/AndroidQt/src/FILES b/samples/qt/AndroidQt/src/FILES deleted file mode 100644 index 0bb880c9b3..0000000000 --- a/samples/qt/AndroidQt/src/FILES +++ /dev/null @@ -1,9 +0,0 @@ -AndroidQt.cxx -AndroidQt.h -AndroidQt.qrc -AndroidQt_TouchParameters.cxx -AndroidQt_TouchParameters.h -AndroidQt_UserInteractionParameters.h -AndroidQt_Window.cxx -AndroidQt_Window.h -Main.cxx diff --git a/samples/qt/Common/src/FILES b/samples/qt/Common/src/FILES deleted file mode 100644 index 12ba2818f3..0000000000 --- a/samples/qt/Common/src/FILES +++ /dev/null @@ -1,17 +0,0 @@ -ApplicationCommon.cxx -ApplicationCommon.h -Common-icon.ts -Common-string.ts -CommonSample.h -DocumentCommon.cxx -DocumentCommon.h -Material.cxx -Material.h -MDIWindow.cxx -MDIWindow.h -OcctWindow.cxx -OcctWindow.h -Transparency.cxx -Transparency.h -View.cxx -View.h diff --git a/samples/qt/FuncDemo/CMakeLists.txt b/samples/qt/FuncDemo/CMakeLists.txt index 1ea39b5fe2..afa0ec7fea 100644 --- a/samples/qt/FuncDemo/CMakeLists.txt +++ b/samples/qt/FuncDemo/CMakeLists.txt @@ -1,8 +1,14 @@ project(FuncDemo) -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample) +# Sample configuration +set (EXECUTABLE_PROJECT ON) +set (USE_QT ON) +set (RELATIVE_DIR "samples/qt") +set (TARGET_FOLDER "Samples") + +include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}") + OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample) if (BUILD_Inspector) target_link_libraries (FuncDemo TKTInspector) diff --git a/samples/qt/FuncDemo/EXTERNLIB b/samples/qt/FuncDemo/EXTERNLIB deleted file mode 100644 index 7ced3fdd54..0000000000 --- a/samples/qt/FuncDemo/EXTERNLIB +++ /dev/null @@ -1,14 +0,0 @@ -TKBO -TKBRep -TKCAF -TKCDF -TKG2d -TKG3d -TKGeomAlgo -TKGeomBase -TKernel -TKLCAF -TKMath -TKMesh -TKPrim -TKTopAlgo diff --git a/samples/qt/FuncDemo/EXTERNLIB.cmake b/samples/qt/FuncDemo/EXTERNLIB.cmake new file mode 100644 index 0000000000..d34ba941be --- /dev/null +++ b/samples/qt/FuncDemo/EXTERNLIB.cmake @@ -0,0 +1,17 @@ +# External dependencies for FuncDemo sample +set(OCCT_FuncDemo_EXTERNAL_LIBS + TKBO + TKBRep + TKCAF + TKCDF + TKG2d + TKG3d + TKGeomAlgo + TKGeomBase + TKernel + TKLCAF + TKMath + TKMesh + TKPrim + TKTopAlgo +) \ No newline at end of file diff --git a/samples/qt/FuncDemo/FILES b/samples/qt/FuncDemo/FILES deleted file mode 100644 index ca4f0e567b..0000000000 --- a/samples/qt/FuncDemo/FILES +++ /dev/null @@ -1,2 +0,0 @@ -EXTERNLIB -PACKAGES diff --git a/samples/qt/FuncDemo/FILES.cmake b/samples/qt/FuncDemo/FILES.cmake new file mode 100644 index 0000000000..ed56eb76c0 --- /dev/null +++ b/samples/qt/FuncDemo/FILES.cmake @@ -0,0 +1,33 @@ +# Source files for FuncDemo sample +set(OCCT_FuncDemo_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}") + +set(OCCT_FuncDemo_FILES + src/BaseDriver.cpp + src/BaseDriver.h + src/CircleDriver.cpp + src/CircleDriver.h + src/ConeDriver.cpp + src/ConeDriver.h + src/CylinderDriver.cpp + src/CylinderDriver.h + src/edge.cpp + src/edge.h + src/FThread.cpp + src/FThread.h + src/FuncDemo.qrc + src/graphwidget.cpp + src/graphwidget.h + src/main.cpp + src/mainwindow.cpp + src/mainwindow.h + src/node.cpp + src/node.h + src/PointDriver.cpp + src/PointDriver.h + src/PrismDriver.cpp + src/PrismDriver.h + src/ShapeSaverDriver.cpp + src/ShapeSaverDriver.h + src/SimpleDriver.cpp + src/SimpleDriver.h +) \ No newline at end of file diff --git a/samples/qt/FuncDemo/PACKAGES b/samples/qt/FuncDemo/PACKAGES deleted file mode 100644 index 6417933607..0000000000 --- a/samples/qt/FuncDemo/PACKAGES +++ /dev/null @@ -1 +0,0 @@ -FuncDemo/src \ No newline at end of file diff --git a/samples/qt/FuncDemo/PACKAGES.cmake b/samples/qt/FuncDemo/PACKAGES.cmake new file mode 100644 index 0000000000..310092e7a4 --- /dev/null +++ b/samples/qt/FuncDemo/PACKAGES.cmake @@ -0,0 +1,4 @@ +# Packages for FuncDemo sample +set(OCCT_FuncDemo_LIST_OF_PACKAGES + FuncDemo +) \ No newline at end of file diff --git a/samples/qt/FuncDemo/src/FILES b/samples/qt/FuncDemo/src/FILES deleted file mode 100644 index 07ace65e6e..0000000000 --- a/samples/qt/FuncDemo/src/FILES +++ /dev/null @@ -1,28 +0,0 @@ -BaseDriver.cpp -BaseDriver.h -CircleDriver.cpp -CircleDriver.h -ConeDriver.cpp -ConeDriver.h -CylinderDriver.cpp -CylinderDriver.h -edge.cpp -edge.h -FILES -FThread.cpp -FThread.h -graphwidget.cpp -graphwidget.h -main.cpp -mainwindow.cpp -mainwindow.h -node.cpp -node.h -PointDriver.cpp -PointDriver.h -PrismDriver.cpp -PrismDriver.h -ShapeSaverDriver.cpp -ShapeSaverDriver.h -SimpleDriver.cpp -SimpleDriver.h diff --git a/samples/qt/IESample/CMakeLists.txt b/samples/qt/IESample/CMakeLists.txt index a8dffeedcb..395352abcd 100644 --- a/samples/qt/IESample/CMakeLists.txt +++ b/samples/qt/IESample/CMakeLists.txt @@ -1,11 +1,18 @@ project(IESample) -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample) +# Sample configuration +set (EXECUTABLE_PROJECT ON) +set (USE_QT ON) +set (RELATIVE_DIR "samples/qt") +set (TARGET_FOLDER "Samples") + +include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}") include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/Interface/src") include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/Common/src") + OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample) -ADD_DEFINITIONS(-DNO_COMMONSAMPLE_EXPORTS -DNO_IESAMPLE_EXPORTS) +# Target-specific definitions +target_compile_definitions(IESample PRIVATE -DNO_COMMONSAMPLE_EXPORTS -DNO_IESAMPLE_EXPORTS) diff --git a/samples/qt/IESample/EXTERNLIB b/samples/qt/IESample/EXTERNLIB deleted file mode 100644 index 77612e08d9..0000000000 --- a/samples/qt/IESample/EXTERNLIB +++ /dev/null @@ -1,26 +0,0 @@ -TKBRep -TKBool -TKBO -TKCDF -TKFillet -TKG2d -TKG3d -TKGeomAlgo -TKGeomBase -TKHLR -TKDEIGES -TKernel -TKMath -TKMesh -TKOffset -TKOpenGl -TKPrim -TKShHealing -TKService -TKDESTEP -TKDESTL -TKTopAlgo -TKV3d -TKDEVRML -TKXSBase - diff --git a/samples/qt/IESample/EXTERNLIB.cmake b/samples/qt/IESample/EXTERNLIB.cmake new file mode 100644 index 0000000000..6751415686 --- /dev/null +++ b/samples/qt/IESample/EXTERNLIB.cmake @@ -0,0 +1,28 @@ +# External dependencies for IESample sample +set(OCCT_IESample_EXTERNAL_LIBS + TKBRep + TKBool + TKBO + TKCDF + TKFillet + TKG2d + TKG3d + TKGeomAlgo + TKGeomBase + TKHLR + TKDEIGES + TKernel + TKMath + TKMesh + TKOffset + TKOpenGl + TKPrim + TKShHealing + TKService + TKDESTEP + TKDESTL + TKTopAlgo + TKV3d + TKDEVRML + TKXSBase +) \ No newline at end of file diff --git a/samples/qt/IESample/FILES b/samples/qt/IESample/FILES deleted file mode 100644 index ca4f0e567b..0000000000 --- a/samples/qt/IESample/FILES +++ /dev/null @@ -1,2 +0,0 @@ -EXTERNLIB -PACKAGES diff --git a/samples/qt/IESample/FILES.cmake b/samples/qt/IESample/FILES.cmake new file mode 100644 index 0000000000..fb6b460229 --- /dev/null +++ b/samples/qt/IESample/FILES.cmake @@ -0,0 +1,29 @@ +# Source files for IESample sample +set(OCCT_IESample_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}") + +set(OCCT_IESample_FILES + src/Main.cxx + ../Common/src/ApplicationCommon.cxx + ../Common/src/ApplicationCommon.h + ../Common/src/Common-icon.ts + ../Common/src/Common-string.ts + ../Common/src/CommonSample.h + ../Common/src/DocumentCommon.cxx + ../Common/src/DocumentCommon.h + ../Common/src/Material.cxx + ../Common/src/Material.h + ../Common/src/MDIWindow.cxx + ../Common/src/MDIWindow.h + ../Common/src/OcctWindow.cxx + ../Common/src/OcctWindow.h + ../Common/src/Transparency.cxx + ../Common/src/Transparency.h + ../Common/src/View.cxx + ../Common/src/View.h + ../Interface/src/Application.cxx + ../Interface/src/Application.h + ../Interface/src/IESample.h + ../Interface/src/Interface-string.ts + ../Interface/src/Translate.cxx + ../Interface/src/Translate.h +) \ No newline at end of file diff --git a/samples/qt/IESample/PACKAGES b/samples/qt/IESample/PACKAGES deleted file mode 100644 index aa9aa1a3ca..0000000000 --- a/samples/qt/IESample/PACKAGES +++ /dev/null @@ -1,3 +0,0 @@ -IESample/src -Common/src -Interface/src \ No newline at end of file diff --git a/samples/qt/IESample/PACKAGES.cmake b/samples/qt/IESample/PACKAGES.cmake new file mode 100644 index 0000000000..812f8bb892 --- /dev/null +++ b/samples/qt/IESample/PACKAGES.cmake @@ -0,0 +1,4 @@ +# Packages for IESample sample +set(OCCT_IESample_LIST_OF_PACKAGES + IESample +) \ No newline at end of file diff --git a/samples/qt/IESample/src/FILES b/samples/qt/IESample/src/FILES deleted file mode 100644 index f9dea79a18..0000000000 --- a/samples/qt/IESample/src/FILES +++ /dev/null @@ -1 +0,0 @@ -Main.cxx \ No newline at end of file diff --git a/samples/qt/Interface/src/FILES b/samples/qt/Interface/src/FILES deleted file mode 100644 index c338ab41f5..0000000000 --- a/samples/qt/Interface/src/FILES +++ /dev/null @@ -1,6 +0,0 @@ -Application.cxx -Application.h -IESample.h -Interface-string.ts -Translate.cxx -Translate.h diff --git a/samples/qt/OCCTOverview/.DS_Store b/samples/qt/OCCTOverview/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0d4b91b9ba209d5a0c920215fb62a99fdb2f40b3 GIT binary patch literal 8196 zcmeHMTWl3Y7@lui=j`!GqO?UVsXvP*FI&V7Ur%3N58@IG2TPINhyh_ncM< zv5F>|c#AP=VnCz5g5g0P@C6bdP-23nG4P@R6JLBWF+TVr{%k`Dgz5 z|DBm{zJKP-9>y5ji@7Hmt7eRGdZZLHD7#CN?ee)JX`!Z^B*>q6Lz%prq1w63&>hy1 zB0?ZSAVMHQAVMHQ;6Xru&TN_ZJfO02&JhV%Ma#Ts>&JbQc5cZ7lhJv7XdVf4H zXGka+5dStiZCF;oI-;dE4`wntp~>Rz7Wd1+U;U_<`hrJDl{>e$i`B z7xv3qx9jFJ^^{m} z?AWT-md1F~@y7VEwJmEK$zx-rA-={5RNVs42BymQF6UB}yN6+DtDG25ewZOOXMu7V}od$Ml6 zIOupOF(;eOXN&o?Z?)y~N&6+s>-DV>UzYkjx8QdKhAAP6p0(Q|JG*3clC{@s)9a+! z{3%0*er9G>?6KO0rZrD(?A)^B`LW7bv&9@^p3z6>IKF+@whH^wUe-eSgnp=kRrj)_^bD-AQgROjOB z{v3^Ohntff<$@N|j6cEoeyQ&$Sd=TZVb;}?L%Q3eX{c8iD^}{d@VbxE$|_f5bu-sR zZcjd)vGSp6T`Q@!^^_F6q4JpxT%Uu+-mE(~NYnI`+HCLOTwFXT``(`R{GCIVb8A#x zo2l(mpEr;$SUZP_T%k|bcFu!EBfWIml(T)epdg8xyExw`U)Pq)(VHq4Rxj9{G)-C} z+bP*ZWm<8?Xz>&0ye3hv7HASIdQGA!TsO{4wt^1B&8(kUY>1s;Z?Ti?6g$n%v5V|7 z`;lE^zp!7~b#{aO!Tw_ZpbX`hjtU5vScFFqLp@fb8Eepnt=NX`cn(SQ;{Xog5G*)w zF@yp}@CshV3A~QC@gY9K$M^(a;xx|SE1bmze24FG89(4EuHy!N!{7K9H#Mdi+B~gR zTc*`%^;(10thH(FYV6v0*zBLoL2Vn=!!3ZqCj5k_jodA4V$XINTONq8xi&Khl)3Zf zS1qYowtQ8~`ot|VDf*2w?sg^zKwE zLQ5YriLr*UVIu|F6~TgT+F~6sA>-se_w1| XEtLNE4*^zm{-0ve`5%z)A