Author: jgardou
Date: Sat Sep 25 17:42:29 2010
New Revision: 48881
URL: http://svn.reactos.org/svn/reactos?rev=48881&view=rev
Log:
[CMAKE]
- improve cacls build file
- add control and extrac32 to build
Added:
branches/cmake-bringup/base/applications/control/CMakeLists.txt (with
props)
branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt (with
props)
branches/cmake-bringup/importlibs/libsetupapi.a (with props)
branches/cmake-bringup/importlibs/libshlwapi.a (with props)
Modified:
branches/cmake-bringup/base/applications/CMakeLists.txt
branches/cmake-bringup/base/applications/cacls/CMakeLists.txt
Modified: branches/cmake-bringup/base/applications/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/CMakeLists.txt?rev=48881&r1=48880&r2=48881&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Sat
Sep 25 17:42:29 2010
@@ -3,9 +3,9 @@
add_subdirectory(calc)
add_subdirectory(charmap)
add_subdirectory(cmdutils)
-#add_subdirectory(control)
+add_subdirectory(control)
#add_subdirectory(dxdiag)
-#add_subdirectory(extrac32)
+add_subdirectory(extrac32)
#add_subdirectory(fontview)
#add_subdirectory(games)
#add_subdirectory(hh)
Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cacls/CMakeLists.txt?rev=48881&r1=48880&r2=48881&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1]
Sat Sep 25 17:42:29 2010
@@ -1,12 +1,16 @@
-add_executable(cacls
+list(APPEND SOURCE
cacls.c
cacls.rc)
-set_module_type(cacls win32cui)
+add_executable(cacls
+ ${CMAKE_CURRENT_BINARY_DIR}/cacls_precomp.h.gch
+ ${SOURCE})
+
+add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
set_unicode(cacls yes)
-add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt)
+set_module_type(cacls win32cui)
-add_dependencies(cacls psdk)
+add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt)
Added: branches/cmake-bringup/base/applications/control/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/control/CMakeLists.txt?rev=48881&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/control/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/applications/control/CMakeLists.txt
[iso-8859-1] Sat Sep 25 17:42:29 2010
@@ -1,0 +1,10 @@
+
+add_executable(control
+ control.c
+ control.rc)
+
+set_unicode(control yes)
+
+set_module_type(control win32gui)
+
+add_importlibs(control advapi32 shell32 kernel32 msvcrt)
Propchange: branches/cmake-bringup/base/applications/control/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt?rev=48881&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt
[iso-8859-1] Sat Sep 25 17:42:29 2010
@@ -1,0 +1,10 @@
+
+add_executable(extrac32 extrac32.c)
+
+set_unicode(extrac32 yes)
+
+set_module_type(extrac32 win32gui)
+
+target_link_libraries(extrac32 wine)
+
+add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt)
Propchange: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/importlibs/libsetupapi.a
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsetupapi.a?rev=48881&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/cmake-bringup/importlibs/libsetupapi.a
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/cmake-bringup/importlibs/libshlwapi.a
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshlwapi.a?rev=48881&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/cmake-bringup/importlibs/libshlwapi.a
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
