1 Aug
2012
1 Aug
'12
11:26 p.m.
Author: akhaldi
Date: Wed Aug 1 23:26:54 2012
New Revision: 57020
URL: http://svn.reactos.org/svn/reactos?rev=57020&view=rev
Log:
* Addendum to r57019.
Modified:
trunk/rostests/winetests/comctl32/CMakeLists.txt
trunk/rostests/winetests/inetcomm/CMakeLists.txt
trunk/rostests/winetests/itss/CMakeLists.txt
trunk/rostests/winetests/jscript/CMakeLists.txt
trunk/rostests/winetests/msctf/CMakeLists.txt
trunk/rostests/winetests/mstask/CMakeLists.txt
trunk/rostests/winetests/qmgr/CMakeLists.txt
trunk/rostests/winetests/rpcrt4/CMakeLists.txt
Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL…
==============================================================================
--- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:26:54
2012
@@ -33,9 +33,7 @@
target_link_libraries(comctl32_winetest wine)
-if(MSVC)
- target_link_libraries(comctl32_winetest uuid)
-else()
+if(NOT MSVC)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
#add_target_compile_flags(comctl32_winetest "-Wno-format")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS
"-Wno-format")
Modified: trunk/rostests/winetests/inetcomm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/CMakeL…
==============================================================================
--- trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:26:54
2012
@@ -8,11 +8,6 @@
add_executable(inetcomm_winetest ${SOURCE})
target_link_libraries(inetcomm_winetest wine)
-
-if(MSVC)
- target_link_libraries(inetcomm_winetest uuid)
-endif()
-
set_module_type(inetcomm_winetest win32cui)
add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32 ntdll)
add_cd_file(TARGET inetcomm_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/itss/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/CMakeLists…
==============================================================================
--- trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:26:54 2012
@@ -1,15 +1,7 @@
add_definitions(-D__ROS_LONG64__)
-
-set_rc_compiler()
-
add_executable(itss_winetest protocol.c testlist.c rsrc.rc)
target_link_libraries(itss_winetest wine)
-
-if(MSVC)
- target_link_libraries(itss_winetest uuid)
-endif()
-
set_module_type(itss_winetest win32cui)
add_importlibs(itss_winetest ole32 msvcrt kernel32 ntdll)
add_cd_file(TARGET itss_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/jscript/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/CMakeLi…
==============================================================================
--- trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:26:54 2012
@@ -1,8 +1,5 @@
add_definitions(-D__ROS_LONG64__)
-
-set_rc_compiler()
-
list(APPEND SOURCE
activex.c
jscript.c
@@ -12,11 +9,6 @@
add_executable(jscript_winetest ${SOURCE})
target_link_libraries(jscript_winetest wine)
-
-if(MSVC)
- target_link_libraries(jscript_winetest uuid)
-endif()
-
set_module_type(jscript_winetest win32cui)
add_importlibs(jscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET jscript_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/msctf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/CMakeList…
==============================================================================
--- trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:26:54 2012
@@ -1,13 +1,7 @@
add_definitions(-D__ROS_LONG64__)
-
add_executable(msctf_winetest inputprocessor.c testlist.c)
target_link_libraries(msctf_winetest wine)
-
-if(MSVC)
- target_link_libraries(msctf_winetest uuid)
-endif()
-
set_module_type(msctf_winetest win32cui)
add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET msctf_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/mstask/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:26:54 2012
@@ -9,11 +9,6 @@
add_executable(mstask_winetest ${SOURCE})
target_link_libraries(mstask_winetest wine)
-
-if(MSVC)
- target_link_libraries(mstask_winetest uuid)
-endif()
-
set_module_type(mstask_winetest win32cui)
add_importlibs(mstask_winetest ole32 msvcrt kernel32 ntdll)
add_cd_file(TARGET mstask_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/qmgr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/CMakeLists…
==============================================================================
--- trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:26:54 2012
@@ -11,11 +11,6 @@
add_executable(qmgr_winetest ${SOURCE})
target_link_libraries(qmgr_winetest wine)
-
-if(MSVC)
- target_link_libraries(qmgr_winetest uuid)
-endif()
-
set_module_type(qmgr_winetest win32cui)
add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:26:54 2012
@@ -5,11 +5,7 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-if(MSVC)
- set(IDL_FLAGS ${IDL_FLAGS} /prefix server s_ /app_config)
-else()
- set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_)
-endif()
+set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_)
add_rpc_files(client server.idl)
add_rpc_files(server server.idl)