OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-02 17:46:22 +03:00
Code Packages Releases Activity

0024469: cmake mfcsample project skippes ParamsFacesPage

Browse Source 
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
This commit is contained in:
ibs 2013-12-17 10:17:09 +04:00 committed by apn
parent a0726e55a7
commit 4a0c5c25a4
12 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm/templates/tbb.cmake
View File

@ -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")

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

@ -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)

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

@ -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)

4
samples/mfc/standard/03_Viewer2d/CMakeLists.txt
View File

@ -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)

4
samples/mfc/standard/04_Viewer3d/CMakeLists.txt
View File

@ -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)

4
samples/mfc/standard/05_ImportExport/CMakeLists.txt
View File

@ -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)

4
samples/mfc/standard/06_Ocaf/CMakeLists.txt
View File

@ -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)

4
samples/mfc/standard/07_Triangulation/CMakeLists.txt
View File

@ -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)

4
samples/mfc/standard/08_HLR/CMakeLists.txt
View File

@ -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)

4
samples/mfc/standard/09_Animation/CMakeLists.txt
View File

@ -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)

4
samples/mfc/standard/10_Convert/CMakeLists.txt
View File

@ -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)

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

@ -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