From 4a0c5c25a4ee9238e9a35c48863a54fc2e1a18fe Mon Sep 17 00:00:00 2001 From: ibs Date: Tue, 17 Dec 2013 10:17:09 +0400 Subject: [PATCH 1/1] 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 --- adm/templates/tbb.cmake | 2 +- samples/mfc/standard/01_Geometry/CMakeLists.txt | 4 ++-- samples/mfc/standard/02_Modeling/CMakeLists.txt | 4 ++-- samples/mfc/standard/03_Viewer2d/CMakeLists.txt | 4 ++-- samples/mfc/standard/04_Viewer3d/CMakeLists.txt | 4 ++-- samples/mfc/standard/05_ImportExport/CMakeLists.txt | 4 ++-- samples/mfc/standard/06_Ocaf/CMakeLists.txt | 4 ++-- samples/mfc/standard/07_Triangulation/CMakeLists.txt | 4 ++-- samples/mfc/standard/08_HLR/CMakeLists.txt | 4 ++-- samples/mfc/standard/09_Animation/CMakeLists.txt | 4 ++-- samples/mfc/standard/10_Convert/CMakeLists.txt | 4 ++-- samples/mfc/standard/mfcsample/CMakeLists.txt | 2 ++ 12 files changed, 23 insertions(+), 21 deletions(-) diff --git a/adm/templates/tbb.cmake b/adm/templates/tbb.cmake index 4a8de0583c..cc7742646a 100644 --- 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 6480309743..5eeaef640c 100644 --- 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 ebac5c2ed0..d8ed27f2d4 100644 --- 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 ae628cf789..365f722fa1 100644 --- 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 88892ea725..d3181f6313 100644 --- 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 64dec79702..0d4d8eee2b 100644 --- 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 1baf5194db..7233a27ea7 100644 --- 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 fd575b0160..79f7b7f549 100644 --- 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 e3e44468bd..d7b35c9ede 100644 --- 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 88a6c68fe2..c504dd0dac 100644 --- 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 c3b723f103..1405ed9aba 100644 --- 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 f75eb265a5..cec9779176 100644 --- 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 -- 2.20.1