From db348d8c530a8de0c5ad7094b7008aa7507d3eba Mon Sep 17 00:00:00 2001 From: bugmaster Date: Fri, 7 Nov 2014 14:18:45 +0300 Subject: [PATCH] Update CMakeLists.txt for standard mfc sample --- samples/mfc/standard/04_Viewer3d/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/mfc/standard/04_Viewer3d/CMakeLists.txt b/samples/mfc/standard/04_Viewer3d/CMakeLists.txt index 4424a15482..67c8092c84 100644 --- a/samples/mfc/standard/04_Viewer3d/CMakeLists.txt +++ b/samples/mfc/standard/04_Viewer3d/CMakeLists.txt @@ -6,6 +6,7 @@ add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE) set (CMAKE_MFC_FLAG 2) set (Viewer3d_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/04_Viewer3d/src) +set (Viewer3d_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/04_Viewer3d/res) set (Viewer3d_HEADER_FILES ${Viewer3d_SRC_DIR}/BoxRadius.h ${Viewer3d_SRC_DIR}/DlgIsos.h ${Viewer3d_SRC_DIR}/ISession_Curve.h @@ -23,8 +24,8 @@ set (Viewer3d_HEADER_FILES ${Viewer3d_SRC_DIR}/BoxRadius.h ${Viewer3d_SRC_DIR}/ZClippingDlg.h ${Viewer3d_SRC_DIR}/ZCueingDlg.h ${Viewer3d_SRC_DIR}/State.h - ${Viewer3d_SRC_DIR}/resource.h - ${Viewer3d_SRC_DIR}/resource.hm) + ${Viewer3d_RESOURCE_DIR}/resource.h + ${Viewer3d_RESOURCE_DIR}/resource.hm) set (Viewer3d_SOURCE_FILES ${Viewer3d_SRC_DIR}/BoxRadius.cpp ${Viewer3d_SRC_DIR}/DlgIsos.cpp ${Viewer3d_SRC_DIR}/ISession_Curve.cpp @@ -42,9 +43,8 @@ set (Viewer3d_SOURCE_FILES ${Viewer3d_SRC_DIR}/BoxRadius.cpp ${Viewer3d_SRC_DIR}/ZClippingDlg.cpp ${Viewer3d_SRC_DIR}/ZCueingDlg.cpp) -set (Viewer3d_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/04_Viewer3d/res) -set (Viewer3d_RESOURCE_FILES ${Viewer3d_SRC_DIR}/Viewer3d.rc - ${Viewer3d_SRC_DIR}/AISToolbar.bmp +set (Viewer3d_RESOURCE_FILES ${Viewer3d_RESOURCE_DIR}/Viewer3d.rc + ${Viewer3d_RESOURCE_DIR}/AISToolbar.bmp ${Viewer3d_RESOURCE_DIR}/AIS_TB.bmp ${Viewer3d_RESOURCE_DIR}/Toolbar.bmp)