[akhaldi] 52352: [CMAKE] * Remove duplicate _DLL and __USE_CRTIMP definitions. * Link some modules to uuid/oldnames in msvc build.
Author: akhaldi Date: Sat Jun 18 22:02:28 2011 New Revision: 52352
URL: http://svn.reactos.org/svn/reactos?rev=52352&view=rev Log: [CMAKE] * Remove duplicate _DLL and __USE_CRTIMP definitions. * Link some modules to uuid/oldnames in msvc build.
Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/comdlg32/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/msvcrt/CMakeLists.txt trunk/rostests/winetests/qmgr/CMakeLists.txt
Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeLi... ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__)
remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -38,6 +36,11 @@
add_executable(comctl32_winetest ${SOURCE}) target_link_libraries(comctl32_winetest wine) + +if(MSVC) + target_link_libraries(comctl32_winetest uuid) +endif() + set_module_type(comctl32_winetest win32cui) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET comctl32_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/CMakeLi... ============================================================================== --- trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__)
list(APPEND SOURCE filedlg.c @@ -12,6 +10,11 @@
add_executable(comdlg32_winetest ${SOURCE}) target_link_libraries(comdlg32_winetest wine) + +if(MSVC) + target_link_libraries(comdlg32_winetest uuid) +endif() + set_module_type(comdlg32_winetest win32cui) add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET comdlg32_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/CMakeLi... ============================================================================== --- trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__)
list(APPEND SOURCE mimeintl.c @@ -10,6 +8,11 @@
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] Sat Jun 18 22:02:28 2011 @@ -1,12 +1,15 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +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/CMakeLis... ============================================================================== --- trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__)
set_rc_compiler()
@@ -14,6 +12,11 @@
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/CMakeLists... ============================================================================== --- trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,10 +1,13 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +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/CMakeList... ============================================================================== --- trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__)
list(APPEND SOURCE task.c @@ -11,6 +9,11 @@
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/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeList... ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:02:28 2011 @@ -1,8 +1,7 @@
add_definitions( -D__ROS_LONG64__ - -D_CRT_NONSTDC_NO_DEPRECATE - -D_DLL -D__USE_CRTIMP) + -D_CRT_NONSTDC_NO_DEPRECATE)
list(APPEND SOURCE cpp.c @@ -22,6 +21,11 @@ time.c)
add_executable(msvcrt_winetest ${SOURCE}) + +if(MSVC) + target_link_libraries(msvcrt_winetest oldnames) +endif() + set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest msvcrt kernel32 ntdll) add_cd_file(TARGET msvcrt_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] Sat Jun 18 22:02:28 2011 @@ -1,7 +1,5 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__)
list(APPEND SOURCE enum_files.c @@ -13,6 +11,11 @@
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)
-
akhaldi＠svn.reactos.org