https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b012d48d007167fe445f9a...
commit b012d48d007167fe445f9ade50d97ee166ffba6b Author: Serge Gautherie 32623169+SergeGautherie@users.noreply.github.com AuthorDate: Thu Jun 7 18:27:56 2018 +0200 Commit: Thomas Faber 18138474+ThFabba@users.noreply.github.com CommitDate: Thu Jun 7 18:27:56 2018 +0200
[MSI_WINETEST] Fix MSVC_IDE build. (#564)
"reactos-cov\modules\rostests\winetests\msi\msi_winetest.rc(2): error RC2135: file not found: custom.dll [C:\ros_build\modules\rostests\winetests\msi\msi_winetest.vcxproj]".
Output files are written to Debug\ and Release\ subfolders in VSSolution mode, so the RC compiler will only find custom.dll if it knows to look in the right folder.
Thanks to Thomas Faber, who helped.
CORE-11836 --- modules/rostests/winetests/msi/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 23e2f53412..12632b0a04 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -3,6 +3,11 @@ add_definitions( -DUSE_WINE_TODOS -D__WINESRC__)
+if(MSVC_IDE) + # msi_winetest.rc: let rc.exe find custom.dll in its subdirectory, i.e. Debug. + include_directories($<TARGET_FILE_DIR:custom>) +endif() + spec2def(custom.dll custom.spec) add_library(custom SHARED custom.c ${CMAKE_CURRENT_BINARY_DIR}/custom.def) target_link_libraries(custom uuid)
-
Serge Gautherie