From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 18 Oct 2015 17:10:38 +0000 (+0000)
Subject: [MSCONFIG_NEW] C++ is coming. Resistance is futile.
X-Git-Tag: ReactOS-0.4.0~450
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b6a7c1b91a3a868a6e29e039c9e9f8d753485396

[MSCONFIG_NEW] C++ is coming. Resistance is futile.

svn path=/trunk/; revision=69605
---

diff --git a/reactos/base/applications/msconfig_new/CMakeLists.txt b/reactos/base/applications/msconfig_new/CMakeLists.txt
index bdf18cd3fa0..14d2b5d8a1d 100644
--- a/reactos/base/applications/msconfig_new/CMakeLists.txt
+++ b/reactos/base/applications/msconfig_new/CMakeLists.txt
@@ -1,11 +1,7 @@
 
 PROJECT(msconfig_new)
 
-# Currently, C++ files are the exception in this project. Therefore we
-# manually set up only what's needed for C++ support. If the project
-# is converted to C++, then we'll need to use the general C++ set-up.
 set_cpp(WITH_RUNTIME)
-set(IS_CPP 0) # Disable C++ for PCH
 
 include_directories(
     .
@@ -22,25 +18,16 @@ list(APPEND C_SOURCE
     generalpage.c
     msconfig.c
     stringutils.c
-    utils.c
-    precomp.h)
+    utils.c)
 
 list(APPEND CPP_SOURCE
     toolspage.cpp
-    xmldomparser.cpp)
+    xmldomparser.cpp
+    precomp.h)
 
 add_rc_deps(msconfig.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/msconfig.ico)
 add_executable(msconfig_new ${C_SOURCE} ${CPP_SOURCE} msconfig.rc)
-
-# Retrieve the COMPILE_FLAGS property for the .cpp files only
-get_property(cpp_file1_flag SOURCE toolspage.cpp PROPERTY COMPILE_FLAGS)
-get_property(cpp_file2_flag SOURCE xmldomparser.cpp PROPERTY COMPILE_FLAGS)
-# Define PCH usage (see 'add_pch' macro code for more information)
-add_pch(msconfig_new precomp.h C_SOURCE)
-# Remove PCH usage for the .cpp files only (set the original COMPILE_FLAGS property)
-set_property(SOURCE toolspage.cpp PROPERTY COMPILE_FLAGS ${cpp_file1_flag})
-set_property(SOURCE xmldomparser.cpp PROPERTY COMPILE_FLAGS ${cpp_file2_flag})
-
+add_pch(msconfig_new precomp.h CPP_SOURCE)
 set_module_type(msconfig_new win32gui UNICODE)
 target_link_libraries(msconfig_new comsupp)
 add_importlibs(msconfig_new user32 advapi32 version comctl32 ole32 oleaut32 msxml3 shell32 shlwapi msvcrt kernel32)