0024469: cmake mfcsample project skippes ParamsFacesPage

add ParamsFacesPage.cpp and ParamsFacesPage.h in mfcsample cmake project

Unrelated changes: common samples include paths have lower priority than specific ones
Unrelated changes: debug tbb cmake seeks with _debug postfix

diff --git a/adm/templates/tbb.cmake b/adm/templates/tbb.cmake
index 4a8de0583c248c40cda39c762d3eecbf485d6a35..cc7742646abd9be5d8abb068dad91de22e8955af 100644 (file)
--- a/adm/templates/tbb.cmake
+++ b/adm/templates/tbb.cmake
@@ -30,7 +30,7 @@
 
     SET(TBB_DEBUG_POSTFIX "")
     if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-      SET(TBB_DEBUG_POSTFIX "") # _debug postfix removed
+      SET(TBB_DEBUG_POSTFIX "_debug")
     ENDIF()
     
     IF("${3RDPARTY_TBB_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TBB_LIBRARY}" STREQUAL "3RDPARTY_TBB_LIBRARY-NOTFOUND")

diff --git a/samples/mfc/standard/01_Geometry/CMakeLists.txt b/samples/mfc/standard/01_Geometry/CMakeLists.txt
index 64803097434c5df84678f9508fb9b5fb5b774fc1..5eeaef640c063ea962ea1069afe255ba2e45d181 100644 (file)
--- a/samples/mfc/standard/01_Geometry/CMakeLists.txt
+++ b/samples/mfc/standard/01_Geometry/CMakeLists.txt
@@ -75,9 +75,9 @@ install (TARGETS Geometry RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                           LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${Geometry_SRC_DIR}
                      ${Geometry_ISESSION2D_DIR}
-                     ${Geometry_RESOURCE_DIR})
+                     ${Geometry_RESOURCE_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (Geometry mfcsample)
\ 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 ebac5c2ed04e6828503c1bb64669419fae5873c9..d8ed27f2d45a314d335f90fc2bfa972106037947 100644 (file)
--- a/samples/mfc/standard/02_Modeling/CMakeLists.txt
+++ b/samples/mfc/standard/02_Modeling/CMakeLists.txt
@@ -43,8 +43,8 @@ install (TARGETS Modeling RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                           LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${MFC_STANDARD_SAMPLES_DIR}/02_Modeling
-                     ${Modeling_SRC_DIR})
+                     ${Modeling_SRC_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (Modeling mfcsample TKSTEP209 TKSTEPAttr TKSTEPBase TKBO)

diff --git a/samples/mfc/standard/03_Viewer2d/CMakeLists.txt b/samples/mfc/standard/03_Viewer2d/CMakeLists.txt
index ae628cf789283f1dacfa332f53efbf42b0683ba6..365f722fa15809f3533afc554937c0990df90739 100644 (file)
--- a/samples/mfc/standard/03_Viewer2d/CMakeLists.txt
+++ b/samples/mfc/standard/03_Viewer2d/CMakeLists.txt
@@ -39,8 +39,8 @@ install (TARGETS Viewer2d RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                           LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${MFC_STANDARD_SAMPLES_DIR}/03_Viewer2d
-                     ${Viewer2d_SOURCE_DIR})
+                     ${Viewer2d_SOURCE_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (Viewer2d mfcsample)
\ No newline at end of file

diff --git a/samples/mfc/standard/04_Viewer3d/CMakeLists.txt b/samples/mfc/standard/04_Viewer3d/CMakeLists.txt
index 88892ea7252302e2bdc5b97b2f3ac0b63d5d0767..d3181f631399e4e6be476971695e1bf76b84fa7b 100644 (file)
--- a/samples/mfc/standard/04_Viewer3d/CMakeLists.txt
+++ b/samples/mfc/standard/04_Viewer3d/CMakeLists.txt
@@ -67,7 +67,7 @@ install (TARGETS Viewer3d RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                           LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
-                     ${Viewer3d_SRC_DIR})
+                     ${Viewer3d_SRC_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (Viewer3d mfcsample)
\ No newline at end of file

diff --git a/samples/mfc/standard/05_ImportExport/CMakeLists.txt b/samples/mfc/standard/05_ImportExport/CMakeLists.txt
index 64dec79702dd80590835e7de3d08d74a6ae18edd..0d4d8eee2bd3c59f97169dea0e42aba6af1f07e8 100644 (file)
--- a/samples/mfc/standard/05_ImportExport/CMakeLists.txt
+++ b/samples/mfc/standard/05_ImportExport/CMakeLists.txt
@@ -43,8 +43,8 @@ install (TARGETS ImportExport RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                               LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport
-                     ${ImportExport_SRC_DIR})
+                     ${ImportExport_SRC_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (ImportExport mfcsample)
\ No newline at end of file

diff --git a/samples/mfc/standard/06_Ocaf/CMakeLists.txt b/samples/mfc/standard/06_Ocaf/CMakeLists.txt
index 1baf5194db04ec2ef4c56f529b124a4721be0726..7233a27ea71c7b6dd77b7479484a2126f714f04e 100644 (file)
--- a/samples/mfc/standard/06_Ocaf/CMakeLists.txt
+++ b/samples/mfc/standard/06_Ocaf/CMakeLists.txt
@@ -59,8 +59,8 @@ install (TARGETS Ocaf RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                       LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${MFC_STANDARD_SAMPLES_DIR}/06_Ocaf
-                     ${Ocaf_SRC_DIR})
+                     ${Ocaf_SRC_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (Ocaf mfcsample TKLCAF TKBO)
\ No newline at end of file

diff --git a/samples/mfc/standard/07_Triangulation/CMakeLists.txt b/samples/mfc/standard/07_Triangulation/CMakeLists.txt
index fd575b0160538393771de0b39feb6f64e2421212..79f7b7f549c3f7bdc93e120310acce4bf0286a99 100644 (file)
--- a/samples/mfc/standard/07_Triangulation/CMakeLists.txt
+++ b/samples/mfc/standard/07_Triangulation/CMakeLists.txt
@@ -45,8 +45,8 @@ install (TARGETS Triangulation RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                                LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${MFC_STANDARD_SAMPLES_DIR}/07_Triangulation
-                     ${Triangulation_SRC_DIR})
+                     ${Triangulation_SRC_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (Triangulation mfcsample TKSTEP209 TKSTEPAttr TKBO)
\ No newline at end of file

diff --git a/samples/mfc/standard/08_HLR/CMakeLists.txt b/samples/mfc/standard/08_HLR/CMakeLists.txt
index e3e44468bdb6f538c5586392b9a7b4bab98e0900..d7b35c9ede0d298422110bd1d713ea6e2cb739df 100644 (file)
--- a/samples/mfc/standard/08_HLR/CMakeLists.txt
+++ b/samples/mfc/standard/08_HLR/CMakeLists.txt
@@ -67,8 +67,8 @@ install (TARGETS HLR RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                      LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${HLR_RESOURCE_DIR}
-                     ${HLR_SRC_DIR})
+                     ${HLR_SRC_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (HLR mfcsample)
\ No newline at end of file

diff --git a/samples/mfc/standard/09_Animation/CMakeLists.txt b/samples/mfc/standard/09_Animation/CMakeLists.txt
index 88a6c68fe2c8be84f0cb4838a64ee6afa97e9e18..c504dd0dac58fa5338213089f94978cc57eba5a4 100644 (file)
--- a/samples/mfc/standard/09_Animation/CMakeLists.txt
+++ b/samples/mfc/standard/09_Animation/CMakeLists.txt
@@ -50,8 +50,8 @@ install (TARGETS Animation RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                            LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${Animation_RESOURCE_DIR}
-                     ${Animation_SRC_DIR})
+                     ${Animation_SRC_DIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (Animation mfcsample TKBO)
\ No newline at end of file

diff --git a/samples/mfc/standard/10_Convert/CMakeLists.txt b/samples/mfc/standard/10_Convert/CMakeLists.txt
index c3b723f103101c075749eb1d41e3da6048ec0436..1405ed9aba9302e47c98fa2c04a4fdce0da43405 100644 (file)
--- a/samples/mfc/standard/10_Convert/CMakeLists.txt
+++ b/samples/mfc/standard/10_Convert/CMakeLists.txt
@@ -67,9 +67,9 @@ install (TARGETS Convert RUNTIME DESTINATION "${INSTALL_DIR}/bin"
                          LIBRARY DESTINATION "${INSTALL_DIR}/lib")
 
 include_directories (${OCCT_ROOT}/inc
-                     ${MFC_STANDARD_SAMPLES_DIR}/Common
                      ${Convert_SRC_DIR}
                      ${ISESSION_SUBDIR}
-                     ${WNT_SUBDIR})
+                     ${WNT_SUBDIR}
+                     ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
 target_link_libraries (Convert mfcsample)
\ No newline at end of file

diff --git a/samples/mfc/standard/mfcsample/CMakeLists.txt b/samples/mfc/standard/mfcsample/CMakeLists.txt
index f75eb265a5f17323476ff3fb48e8e837b4fafcc5..cec9779176b935ed409016dd005cc0df870ffaf6 100644 (file)
--- a/samples/mfc/standard/mfcsample/CMakeLists.txt
+++ b/samples/mfc/standard/mfcsample/CMakeLists.txt
@@ -22,6 +22,7 @@ set (COMMON_SOURCE_FILES ${MFC_STANDARD_COMMON_SAMPLES_DIR}/AISDialogs.cpp
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/OCC_BaseChildFrame.cpp
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/OCC_BaseView.cpp
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/OCC_MainFrame.cpp
+                         ${MFC_STANDARD_COMMON_SAMPLES_DIR}/ParamsFacesPage.cpp
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/ResultDialog.cpp
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/User_Cylinder.cxx
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/ColoredMeshDlg.cpp
@@ -79,6 +80,7 @@ set (COMMON_HEADER_FILES ${MFC_STANDARD_COMMON_SAMPLES_DIR}/AISDialogs.h
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/OCC_BaseChildFrame.h
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/OCC_BaseView.h
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/OCC_MainFrame.h
+                         ${MFC_STANDARD_COMMON_SAMPLES_DIR}/ParamsFacesPage.h
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/ResultDialog.h
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/User_Cylinder.hxx
                          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/ColoredMeshDlg.h