From: Amine Khaldi Date: Sat, 22 Dec 2012 15:45:00 +0000 (+0000) Subject: [CMAKE] X-Git-Tag: backups/ros-csrss@60644~104^2~63 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=d2351c0d6e60056d92a56b7a5c2f0a58e9cad0a0 [CMAKE] * Remove unneeded set_rc_compiler. ROSAPPS-255 #resolve #comment Fixed in r57968. svn path=/trunk/; revision=57969 --- diff --git a/rosapps/applications/devutils/vgafontedit/CMakeLists.txt b/rosapps/applications/devutils/vgafontedit/CMakeLists.txt index 6786635d327..d89ae7aa61c 100644 --- a/rosapps/applications/devutils/vgafontedit/CMakeLists.txt +++ b/rosapps/applications/devutils/vgafontedit/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE aboutdlg.c editglyphdlg.c @@ -16,5 +14,4 @@ add_pch(vgafontedit precomp.h) add_executable(vgafontedit ${SOURCE}) set_module_type(vgafontedit win32gui UNICODE) add_importlibs(vgafontedit user32 gdi32 comdlg32 msvcrt kernel32) - add_cd_file(TARGET vgafontedit DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/imagesoft/CMakeLists.txt b/rosapps/applications/imagesoft/CMakeLists.txt index 27e1ae8ff3d..d6661b85267 100644 --- a/rosapps/applications/imagesoft/CMakeLists.txt +++ b/rosapps/applications/imagesoft/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE about.c adjust.c @@ -21,5 +19,4 @@ add_pch(imagesoft precomp.h) add_executable(imagesoft ${SOURCE}) set_module_type(imagesoft win32gui UNICODE) add_importlibs(imagesoft gdi32 user32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) - add_cd_file(TARGET imagesoft DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/screensavers/blankscr/CMakeLists.txt b/rosapps/applications/screensavers/blankscr/CMakeLists.txt index cce9689b6d5..efef99dc5e7 100644 --- a/rosapps/applications/screensavers/blankscr/CMakeLists.txt +++ b/rosapps/applications/screensavers/blankscr/CMakeLists.txt @@ -1,14 +1,7 @@ -set_rc_compiler() - -add_executable(blankscr - scrnsave.c - scrnsave.rc) - +add_executable(blankscr scrnsave.c scrnsave.rc) set_module_type(blankscr win32gui UNICODE) set_target_properties(blankscr PROPERTIES SUFFIX ".scr") - target_link_libraries(blankscr scrnsave) add_importlibs(blankscr user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET blankscr DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/screensavers/butterflies/CMakeLists.txt b/rosapps/applications/screensavers/butterflies/CMakeLists.txt index 6c9849666da..48fe02d8c97 100644 --- a/rosapps/applications/screensavers/butterflies/CMakeLists.txt +++ b/rosapps/applications/screensavers/butterflies/CMakeLists.txt @@ -1,14 +1,7 @@ -set_rc_compiler() - -add_executable(butterflies - butterflies.c - butterflies.rc) - +add_executable(butterflies butterflies.c butterflies.rc) set_module_type(butterflies win32gui UNICODE) set_target_properties(butterflies PROPERTIES SUFFIX ".scr") - target_link_libraries(butterflies scrnsave) add_importlibs(butterflies user32 gdi32 opengl32 glu32 advapi32 shell32 msvcrt kernel32) - add_cd_file(TARGET butterflies DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/screensavers/circles/CMakeLists.txt b/rosapps/applications/screensavers/circles/CMakeLists.txt index 8609a6d1669..fbf34fdcc0f 100644 --- a/rosapps/applications/screensavers/circles/CMakeLists.txt +++ b/rosapps/applications/screensavers/circles/CMakeLists.txt @@ -1,14 +1,7 @@ -set_rc_compiler() - -add_executable(circles - circles.c - circles.rc) - +add_executable(circles circles.c circles.rc) set_module_type(circles win32gui UNICODE) set_target_properties(circles PROPERTIES SUFFIX ".scr") - target_link_libraries(circles scrnsave) add_importlibs(circles user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET circles DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/screensavers/cylfrac/CMakeLists.txt b/rosapps/applications/screensavers/cylfrac/CMakeLists.txt index 0568489d504..6527cef3c4d 100644 --- a/rosapps/applications/screensavers/cylfrac/CMakeLists.txt +++ b/rosapps/applications/screensavers/cylfrac/CMakeLists.txt @@ -1,13 +1,6 @@ -set_rc_compiler() - -add_executable(cylfrac - cylfrac.c - cylfrac.rc) - +add_executable(cylfrac cylfrac.c cylfrac.rc) set_module_type(cylfrac win32gui UNICODE) set_target_properties(cylfrac PROPERTIES SUFFIX ".scr") - add_importlibs(cylfrac user32 gdi32 opengl32 glu32 winmm msvcrt kernel32) - add_cd_file(TARGET cylfrac DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/screensavers/matrix/CMakeLists.txt b/rosapps/applications/screensavers/matrix/CMakeLists.txt index e8cf714a59e..cf2f6134040 100644 --- a/rosapps/applications/screensavers/matrix/CMakeLists.txt +++ b/rosapps/applications/screensavers/matrix/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_executable(matrix config.c matrix.c @@ -12,7 +10,5 @@ add_executable(matrix set_module_type(matrix win32gui UNICODE) set_target_properties(matrix PROPERTIES SUFFIX ".scr") - add_importlibs(matrix user32 gdi32 winspool advapi32 comctl32 comdlg32 shell32 msvcrt kernel32) - add_cd_file(TARGET matrix DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/screensavers/mazescr/CMakeLists.txt b/rosapps/applications/screensavers/mazescr/CMakeLists.txt index 43967baa92b..c31f6d32d70 100644 --- a/rosapps/applications/screensavers/mazescr/CMakeLists.txt +++ b/rosapps/applications/screensavers/mazescr/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_executable(mazescr scrnsave.c maze.c @@ -8,7 +6,5 @@ add_executable(mazescr set_module_type(mazescr win32gui) set_target_properties(mazescr PROPERTIES SUFFIX ".scr") - add_importlibs(mazescr user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET mazescr DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/screensavers/ssstars/CMakeLists.txt b/rosapps/applications/screensavers/ssstars/CMakeLists.txt index 90103798d86..b829e11035a 100644 --- a/rosapps/applications/screensavers/ssstars/CMakeLists.txt +++ b/rosapps/applications/screensavers/ssstars/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_executable(ssstars ssstars.c settings.c @@ -8,8 +6,6 @@ add_executable(ssstars set_module_type(ssstars win32gui UNICODE) set_target_properties(ssstars PROPERTIES SUFFIX ".scr") - target_link_libraries(ssstars scrnsave) add_importlibs(ssstars user32 gdi32 opengl32 glu32 advapi32 comctl32 shell32 msvcrt kernel32) - add_cd_file(TARGET ssstars DESTINATION reactos/system32 FOR all) diff --git a/rosapps/applications/screensavers/starfield/CMakeLists.txt b/rosapps/applications/screensavers/starfield/CMakeLists.txt index 89113a4833d..24d4aa6cd1a 100644 --- a/rosapps/applications/screensavers/starfield/CMakeLists.txt +++ b/rosapps/applications/screensavers/starfield/CMakeLists.txt @@ -1,13 +1,6 @@ -set_rc_compiler() - -add_executable(starfield - screensaver.c - starfield.rc) - +add_executable(starfield screensaver.c starfield.rc) set_module_type(starfield win32gui UNICODE) set_target_properties(starfield PROPERTIES SUFFIX ".scr") - add_importlibs(starfield user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET starfield DESTINATION reactos/system32 FOR all) diff --git a/rosapps/demos/maze/CMakeLists.txt b/rosapps/demos/maze/CMakeLists.txt index f83ebd1aba8..73a81a56063 100644 --- a/rosapps/demos/maze/CMakeLists.txt +++ b/rosapps/demos/maze/CMakeLists.txt @@ -1,12 +1,5 @@ -set_rc_compiler() - -add_executable(maze - maze.c - maze.rc) - +add_executable(maze maze.c maze.rc) set_module_type(maze win32gui) - add_importlibs(maze user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET maze DESTINATION reactos/system32 FOR all) diff --git a/rosapps/drivers/green/CMakeLists.txt b/rosapps/drivers/green/CMakeLists.txt index 014cc62a873..724b336c627 100644 --- a/rosapps/drivers/green/CMakeLists.txt +++ b/rosapps/drivers/green/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_library(green SHARED createclose.c dispatch.c @@ -13,7 +11,6 @@ add_library(green SHARED green.rc) add_pch(green green.h) - set_module_type(green kernelmodedriver) add_importlibs(green ntoskrnl hal) add_cd_file(TARGET green DESTINATION reactos/system32/drivers NO_CAB FOR all)