From 1e367ccbb73f8581ed676456e26266f3d69cec9e Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Tue, 25 May 2021 23:06:44 +0200 Subject: [PATCH] [0.4.13] Fix VSSolution's msbuild CORE-15991 It regressed by 0.4.12-dev-1064-g 09c4d0a74b2362e2c9d29ec87c54ecc3bddd5b79 when we tried to mute compiler warnings in the GCC Release configuration for all modules, that do contain .y files. In master we switched to use flex+bison to process those files at build-time in 0.4.15-dev-2277-g 28dadda8be69da7d8e2aa64ba0daf09e88fb4330 and at the same time reverted the guilty rev. In the backport to the old releases we do only revert, but do not introduce flex+bison. This will reintroduce the warnings in GCC Release configuration. --- base/applications/winhlp32/CMakeLists.txt | 3 --- dll/directx/wine/d3dcompiler_43/CMakeLists.txt | 8 -------- dll/win32/jscript/CMakeLists.txt | 3 --- dll/win32/msi/CMakeLists.txt | 3 --- dll/win32/msxml3/CMakeLists.txt | 3 --- dll/win32/vbscript/CMakeLists.txt | 3 --- dll/win32/wbemprox/CMakeLists.txt | 3 --- 7 files changed, 26 deletions(-) diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index 0deaeafee5d..75d45d96099 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -14,9 +14,6 @@ list(APPEND SOURCE winhelp.c precomp.h) -# macro.lex.yy.c has been generated with relative file paths... -set_source_files_properties(macro.lex.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico) add_executable(winhlp32 ${SOURCE} macro.lex.yy.c string.c rsrc.rc) set_module_type(winhlp32 win32gui) diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index 7c5cb428400..ff0210c5b37 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -26,14 +26,6 @@ add_library(d3dcompiler_43 MODULE version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def) -# some files have been generated with relative file paths... -set_source_files_properties( - asmshader.tab.c - asmshader.yy.c - hlsl.tab.c - hlsl.yy.c - PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - set_module_type(d3dcompiler_43 win32dll) target_link_libraries(d3dcompiler_43 dx10guid uuid wine wpp) add_importlibs(d3dcompiler_43 msvcrt kernel32 ntdll) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index 826800bacf9..1ab658c5281 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -34,9 +34,6 @@ list(APPEND SOURCE vbarray.c precomp.h) -# cc_parser.tab.c/parser.tab.c have been generated with relative file paths... -set_source_files_properties(cc_parser.tab.c parser.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - list(APPEND jscript_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/jscript.rgs ${CMAKE_CURRENT_SOURCE_DIR}/jscript_classes.rgs diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index e4f586db632..1e635c2963b 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -57,9 +57,6 @@ list(APPEND SOURCE where.c precomp.h) -# cond.tab.c/sql.tab.c have been generated with relative file paths... -set_source_files_properties(cond.tab.c sql.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - add_library(msi MODULE ${SOURCE} cond.tab.c diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index e61ac57f6cd..68c4d534ca7 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -50,9 +50,6 @@ list(APPEND SOURCE precomp.h ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c) -# xslpattern.tab.c/xslpattern.yy.c have been generated with relative file paths... -set_source_files_properties(xslpattern.tab.c xslpattern.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - list(APPEND msxml3_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/msxml3.manifest ${CMAKE_CURRENT_SOURCE_DIR}/msxml3_v1.rgs diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt index b95e66abae6..a272aa82dea 100644 --- a/dll/win32/vbscript/CMakeLists.txt +++ b/dll/win32/vbscript/CMakeLists.txt @@ -16,9 +16,6 @@ list(APPEND SOURCE vbscript_main.c precomp.h) -# parser.tab.c has been generated with relative file paths... -set_source_files_properties(parser.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - list(APPEND vbscript_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/vbscript_classes.rgs ${CMAKE_CURRENT_SOURCE_DIR}/vbsglobal.rgs diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt index 3f48d3e6d5c..a0c714ea792 100644 --- a/dll/win32/wbemprox/CMakeLists.txt +++ b/dll/win32/wbemprox/CMakeLists.txt @@ -21,9 +21,6 @@ list(APPEND SOURCE wbemlocator.c precomp.h) -# wql.tab.c has been generated with relative file paths... -set_source_files_properties(wql.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - add_library(wbemprox MODULE ${SOURCE} wql.tab.c