Author: akhaldi
Date: Wed Apr 20 12:39:37 2016
New Revision: 71185
URL: http://svn.reactos.org/svn/reactos?rev=71185&view=rev
Log:
* Addendum to r71184. CORE-9111
Modified:
trunk/rostests/apitests/atl/CMakeLists.txt
trunk/rostests/apitests/shell32/CMakeLists.txt
trunk/rostests/kmtests/CMakeLists.txt
trunk/rostests/rosautotest/CMakeLists.txt
trunk/rostests/tests/mmixer_test/CMakeLists.txt
trunk/rostests/winetests/advapi32/CMakeLists.txt
trunk/rostests/winetests/imm32/CMakeLists.txt
trunk/rostests/winetests/kernel32/CMakeLists.txt
trunk/rostests/winetests/localspl/CMakeLists.txt
trunk/rostests/winetests/localui/CMakeLists.txt
trunk/rostests/winetests/ntdll/CMakeLists.txt
trunk/rostests/winetests/oleaut32/CMakeLists.txt
trunk/rostests/winetests/oledlg/CMakeLists.txt
trunk/rostests/winetests/quartz/CMakeLists.txt
trunk/rostests/winetests/ws2_32/CMakeLists.txt
Modified: trunk/rostests/apitests/atl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,7 +1,7 @@
set_cpp(WITH_RUNTIME)
-include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
add_executable(atl_apitest
CComBSTR.cpp
Modified: trunk/rostests/apitests/shell32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,7 +1,7 @@
set_cpp(WITH_RUNTIME)
-include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
add_executable(shell32_apitest
CMyComputer.cpp
Modified: trunk/rostests/kmtests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -100,11 +100,11 @@
add_library(kmtest_printf
kmtest_drv/printf_stubs.c
- ${REACTOS_SOURCE_DIR}/lib/sdk/crt/string/strnlen.c
- ${REACTOS_SOURCE_DIR}/lib/sdk/crt/string/wcsnlen.c
- ${REACTOS_SOURCE_DIR}/lib/sdk/crt/printf/streamout.c)
+ ${REACTOS_SOURCE_DIR}/sdk/lib/crt/string/strnlen.c
+ ${REACTOS_SOURCE_DIR}/sdk/lib/crt/string/wcsnlen.c
+ ${REACTOS_SOURCE_DIR}/sdk/lib/crt/printf/streamout.c)
add_target_compile_definitions(kmtest_printf _LIBCNT_ _USER32_WSPRINTF
wctomb=KmtWcToMb)
-add_target_include_directories(kmtest_printf
${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)
+add_target_include_directories(kmtest_printf
${REACTOS_SOURCE_DIR}/sdk/lib/crt/include)
#
# kmtest.exe loader application
Modified: trunk/rostests/rosautotest/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -22,7 +22,7 @@
tools.cpp
precomp.h)
-add_executable(rosautotest ${SOURCE}
${REACTOS_BINARY_DIR}/include/reactos/rosautotestmsg.rc)
+add_executable(rosautotest ${SOURCE}
${REACTOS_BINARY_DIR}/sdk/include/reactos/rosautotestmsg.rc)
set_module_type(rosautotest win32cui UNICODE)
add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32
ntdll)
add_pch(rosautotest precomp.h SOURCE)
Modified: trunk/rostests/tests/mmixer_test/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,7 +1,7 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sound/mmixer)
add_executable(mmixer_test test.c)
set_module_type(mmixer_test win32cui)
target_link_libraries(mmixer_test mmixer)
Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,5 +1,5 @@
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
list(APPEND SOURCE
cred.c
Modified: trunk/rostests/winetests/imm32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,5 +1,5 @@
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_executable(imm32_winetest imm32.c testlist.c)
set_module_type(imm32_winetest win32cui)
add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32)
Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,5 +1,5 @@
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
list(APPEND SOURCE
Modified: trunk/rostests/winetests/localspl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,5 +1,5 @@
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_executable(localspl_winetest localmon.c testlist.c)
set_module_type(localspl_winetest win32cui)
add_importlibs(localspl_winetest advapi32 msvcrt kernel32)
Modified: trunk/rostests/winetests/localui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/localui/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/localui/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,5 +1,5 @@
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_executable(localui_winetest localui.c testlist.c)
set_module_type(localui_winetest win32cui)
add_importlibs(localui_winetest winspool msvcrt kernel32)
Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,5 +1,5 @@
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
add_definitions(-D__WINESRC__)
Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,6 +1,6 @@
add_definitions(-DUSE_WINE_TODOS)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_typelib(test_reg.idl test_tlb.idl tmarshal.idl)
add_idl_Headers(oleaut32_idlheaders test_reg.idl test_tlb.idl tmarshal.idl)
generate_idl_iids(test_reg.idl test_tlb.idl tmarshal.idl)
Modified: trunk/rostests/winetests/oledlg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oledlg/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/oledlg/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/oledlg/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,6 +1,6 @@
add_definitions(-DUSE_WINE_TODOS)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_executable(oledlg_winetest main.c testlist.c)
set_module_type(oledlg_winetest win32cui)
add_importlibs(oledlg_winetest oledlg ole32 user32 msvcrt kernel32)
Modified: trunk/rostests/winetests/quartz/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,5 +1,5 @@
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
list(APPEND SOURCE
avisplitter.c
Modified: trunk/rostests/winetests/ws2_32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/CMakeLists.txt?rev=71185&r1=71184&r2=71185&view=diff
==============================================================================
--- trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] Wed Apr 20
12:39:37 2016
@@ -1,5 +1,5 @@
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_executable(ws2_32_winetest protocol.c sock.c testlist.c)
set_module_type(ws2_32_winetest win32cui)
