https://github.com/Kitware/CMake
Revision 35a29ec82790890df4872e60943e9127e4603e54 authored by Thomas Bernard on 04 April 2020, 09:59:22 UTC, committed by Thomas Bernard on 06 April 2020, 19:19:12 UTC
Since commit 1c2d031cbd (Add -E cmake_llvm_rc to preprocess files for llvm-rc, 2020-01-14, v3.17.0-rc1~24^2) with llvm-rc we explicitly preprocess RC source files and then compile separately without -I flags. This broke cases where the RC source references data files adjacent to itself or in the include path. This change adds the expansion of the include paths when calling the llvm-rc in order for the resource files to be picked up correctly by llvm-rc. Since the RC compiled file is first preprocessed, the file being compiled by llvm-rc resides in the build directory. In order for llvm-rc to find the resource data specified relative to the .rc file being compiled, the source file path is preppended in the include list so that the original source path takes priority over all the other includes paths specified. A space was added in the CMAKE_INCLUDE_FLAG_RC to make the include directive work properly for llvm-rc. Checks on the rc.exe showed that the syntax change doesn't affect it's proper operation. Fixes: #20529
1 parent 42cefc6
Tip revision: 35a29ec82790890df4872e60943e9127e4603e54 authored by Thomas Bernard on 04 April 2020, 09:59:22 UTC
llvm-rc: Restore include path for data after explicit preprocessing
llvm-rc: Restore include path for data after explicit preprocessing
Tip revision: 35a29ec
| File | Mode | Size |
|---|---|---|
| .github | ||
| Auxiliary | ||
| Help | ||
| Licenses | ||
| Modules | ||
| Packaging | ||
| Source | ||
| Templates | ||
| Tests | ||
| Utilities | ||
| .clang-format | -rw-r--r-- | 1.3 KB |
| .clang-tidy | -rw-r--r-- | 1010 bytes |
| .gitattributes | -rw-r--r-- | 1.1 KB |
| .gitignore | -rw-r--r-- | 132 bytes |
| .hooks-config | -rw-r--r-- | 418 bytes |
| CMakeCPack.cmake | -rw-r--r-- | 9.7 KB |
| CMakeCPackOptions.cmake.in | -rw-r--r-- | 11.9 KB |
| CMakeGraphVizOptions.cmake | -rw-r--r-- | 153 bytes |
| CMakeLists.txt | -rw-r--r-- | 30.8 KB |
| CMakeLogo.gif | -rw-r--r-- | 4.4 KB |
| CONTRIBUTING.rst | -rw-r--r-- | 3.1 KB |
| CTestConfig.cmake | -rw-r--r-- | 440 bytes |
| CTestCustom.cmake.in | -rw-r--r-- | 6.7 KB |
| CompileFlags.cmake | -rw-r--r-- | 4.2 KB |
| Copyright.txt | -rw-r--r-- | 5.2 KB |
| DartConfig.cmake | -rw-r--r-- | 374 bytes |
| README.rst | -rw-r--r-- | 3.9 KB |
| bootstrap | -rwxr-xr-x | 53.2 KB |
| cmake_uninstall.cmake.in | -rw-r--r-- | 789 bytes |
| configure | -rwxr-xr-x | 99 bytes |
| doxygen.config | -rw-r--r-- | 27.4 KB |
Computing file changes ...
