Skip to content

Commit fae5678

Browse files
committed
0033750: Configuration - make file configuration failed in mfc example
Updated MFC sample to build together with OCCT
1 parent 488c43e commit fae5678

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

samples/mfc/standard/03_ImportExport/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ project (ImportExport)
1111
add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE)
1212
set (CMAKE_MFC_FLAG 2)
1313

14-
set (ImportExport_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport/src)
14+
set (ImportExport_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/03_ImportExport/src)
1515
set (ImportExport_HEADER_FILES ${ImportExport_SRC_DIR}/ColoredShapes.h
1616
${ImportExport_SRC_DIR}/ImportExportApp.h
1717
${ImportExport_SRC_DIR}/ImportExportDoc.h
@@ -21,7 +21,7 @@ set (ImportExport_SOURCE_FILES ${ImportExport_SRC_DIR}/ColoredShapes.cpp
2121
${ImportExport_SRC_DIR}/ImportExportDoc.cpp
2222
${ImportExport_SRC_DIR}/StdAfx.cpp)
2323

24-
set (ImportExport_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport/res)
24+
set (ImportExport_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/03_ImportExport/res)
2525
set (ImportExport_RESOURCE_HEADER ${ImportExport_RESOURCE_DIR}/resource.h)
2626
set (ImportExport_RESOURCE_FILES ${ImportExport_RESOURCE_DIR}/Toolbar.bmp
2727
${ImportExport_RESOURCE_DIR}/ImportExport.rc)
@@ -55,7 +55,7 @@ else()
5555
endif()
5656

5757
include_directories (${CMAKE_BINARY_DIR}/inc
58-
${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport
58+
${MFC_STANDARD_SAMPLES_DIR}/03_ImportExport
5959
${ImportExport_SRC_DIR}
6060
${MFC_STANDARD_SAMPLES_DIR}/Common)
6161

samples/mfc/standard/04_HLR/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ project (HLR)
1111
add_definitions(-DWINVER=0x0501 -DUNICODE -D_UNICODE)
1212
set (CMAKE_MFC_FLAG 2)
1313

14-
set (HLR_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/08_HLR/src)
14+
set (HLR_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/04_HLR/src)
1515
set (HLR_HEADER_FILES ${HLR_SRC_DIR}/HLRApp.h
1616
${HLR_SRC_DIR}/HLRDoc.h
1717
${HLR_SRC_DIR}/HLRView2D.h
@@ -23,7 +23,7 @@ set (HLR_SOURCE_FILES ${HLR_SRC_DIR}/HLRApp.cpp
2323
${HLR_SRC_DIR}/SelectionDialog.cpp
2424
${HLR_SRC_DIR}/StdAfx.cpp )
2525

26-
set (HLR_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/08_HLR/res)
26+
set (HLR_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/04_HLR/res)
2727
set (HLR_RESOURCE_HEADER ${HLR_RESOURCE_DIR}/resource.h)
2828
set (HLR_RESOURCE_FILES ${HLR_RESOURCE_DIR}/axoviewd.bmp
2929
${HLR_RESOURCE_DIR}/axoviewf.bmp

samples/mfc/standard/mfcsample/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ set (COMMON_HEADER_FILES ${MFC_STANDARD_COMMON_SAMPLES_DIR}/AISDialogs.h
8282
${MFC_STANDARD_COMMON_SAMPLES_DIR}/OCC_StereoConfigDlg.h
8383
${MFC_STANDARD_COMMON_SAMPLES_DIR}/ParamsFacesPage.h
8484
${MFC_STANDARD_COMMON_SAMPLES_DIR}/ResultDialog.h
85-
${MFC_STANDARD_COMMON_SAMPLES_DIR}/User_Cylinder.hxx
8685
${MFC_STANDARD_COMMON_SAMPLES_DIR}/ColoredMeshDlg.h
8786
${MFC_STANDARD_COMMON_SAMPLES_DIR}/DimensionDlg.h
8887
${MFC_STANDARD_COMMON_SAMPLES_DIR}/LengthParamsEdgePage.h

0 commit comments

Comments
 (0)