[ros-diffs] [sir_richard] 48267: [CMAKE]: Add wmc to host tools, and export it as native-wmc. [CMAKE]: Add a makelist to build the mc->headers as one target. [CMAKE]: Fix the IDL rule to build all IDLs as one target. [CMAKE]: Build a whole lot more libraries.
sir_richard at svn.reactos.org
sir_richard at svn.reactos.org
Sun Jul 25 23:05:33 UTC 2010
Author: sir_richard
Date: Sun Jul 25 23:05:32 2010
New Revision: 48267
URL: http://svn.reactos.org/svn/reactos?rev=48267&view=rev
Log:
[CMAKE]: Add wmc to host tools, and export it as native-wmc.
[CMAKE]: Add a makelist to build the mc->headers as one target.
[CMAKE]: Fix the IDL rule to build all IDLs as one target.
[CMAKE]: Build a whole lot more libraries.
Added:
branches/cmake-bringup/include/reactos/mc/CMakeLists.txt (with props)
branches/cmake-bringup/lib/atl/CMakeLists.txt (with props)
branches/cmake-bringup/lib/cmlib/CMakeLists.txt (with props)
branches/cmake-bringup/lib/dnslib/CMakeLists.txt (with props)
branches/cmake-bringup/lib/epsapi/CMakeLists.txt (with props)
branches/cmake-bringup/lib/lsalib/CMakeLists.txt (with props)
branches/cmake-bringup/lib/recyclebin/CMakeLists.txt (with props)
branches/cmake-bringup/lib/rossym/CMakeLists.txt (with props)
branches/cmake-bringup/lib/rtl/CMakeLists.txt (with props)
branches/cmake-bringup/lib/smlib/CMakeLists.txt (with props)
branches/cmake-bringup/lib/tdilib/CMakeLists.txt (with props)
branches/cmake-bringup/tools/wmc/CMakeLists.txt (with props)
Modified:
branches/cmake-bringup/ (props changed)
branches/cmake-bringup/CMakeLists.txt
branches/cmake-bringup/include/psdk/CMakeLists.txt
branches/cmake-bringup/lib/CMakeLists.txt
branches/cmake-bringup/tools/CMakeLists.txt
Propchange: branches/cmake-bringup/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 25 23:05:32 2010
@@ -5,7 +5,8 @@
obj-*
output-*
reactos
-build
+build*
+*.patch
reactos.*
RosBE-Logs
*.sln
Modified: branches/cmake-bringup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=48267&r1=48266&r2=48267&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -16,7 +16,7 @@
add_subdirectory(tools)
-export(TARGETS widl FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+export(TARGETS widl wmc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
else()
@@ -51,6 +51,7 @@
include_directories(./include)
include_directories(./include/psdk)
include_directories(${REACTOS_BINARY_DIR}/include/psdk)
+include_directories(${REACTOS_BINARY_DIR}/include/reactos)
include_directories(./include/crt)
include_directories(./include/crt/mingw32)
include_directories(./include/ddk)
@@ -59,6 +60,7 @@
include_directories(./include/reactos/libs)
add_subdirectory(include/psdk)
+add_subdirectory(include/reactos/mc)
add_subdirectory(lib)
Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMakeLists.txt?rev=48267&r1=48266&r2=48267&view=diff
==============================================================================
--- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -17,7 +17,7 @@
GENERATED TRUE
)
- ADD_CUSTOM_TARGET(build_${FILE}_idl ALL DEPENDS ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h)
+ LIST(APPEND HEADERS ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h)
ENDFOREACH(_in_FILE ${ARGN})
@@ -49,3 +49,4 @@
MACRO_ADD_INTERFACES(${SOURCE})
+ADD_CUSTOM_TARGET(build_headers ALL DEPENDS ${HEADERS})
Added: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/mc/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/include/reactos/mc/CMakeLists.txt (added)
+++ branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,30 @@
+
+MACRO (MACRO_ADD_RESOURCES)
+
+ FOREACH(_in_FILE ${ARGN})
+
+ GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE)
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h
+ COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/${FILE}.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc
+ DEPENDS native-wmc
+ )
+
+ SET_SOURCE_FILES_PROPERTIES(
+ ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h
+ PROPERTIES
+ GENERATED TRUE
+ )
+
+ LIST(APPEND RESOURCES ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h)
+
+ ENDFOREACH(_in_FILE ${ARGN})
+
+ENDMACRO (MACRO_ADD_RESOURCES)
+
+file(GLOB_RECURSE SOURCE "*.mc")
+
+MACRO_ADD_RESOURCES(${SOURCE})
+
+ADD_CUSTOM_TARGET(build_resources ALL DEPENDS ${RESOURCES})
Propchange: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/cmake-bringup/lib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.txt?rev=48267&r1=48266&r2=48267&view=diff
==============================================================================
--- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,2 +1,11 @@
+add_subdirectory(atl)
+add_subdirectory(cmlib)
+add_subdirectory(dnslib)
+add_subdirectory(epsapi)
+add_subdirectory(lsalib)
+add_subdirectory(recyclebin)
+#add_subdirectory(rtl)
add_subdirectory(sdk)
+add_subdirectory(smlib)
+add_subdirectory(tdilib)
Added: branches/cmake-bringup/lib/atl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/atl/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/atl/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,7 @@
+
+file(GLOB_RECURSE SOURCE "*.cpp")
+
+add_definitions(-DUNICODE -D_UNICODE)
+add_definitions(-DROS_Headers)
+
+add_library(atl ${SOURCE})
Propchange: branches/cmake-bringup/lib/atl/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/cmlib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/cmlib/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/cmlib/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,7 @@
+
+
+add_definitions(-D_NTOSKRNL_ -D_NTSYSTEM_ -DNASSERT)
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(cmlib ${SOURCE})
Propchange: branches/cmake-bringup/lib/cmlib/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/dnslib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/dnslib/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/dnslib/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/dnslib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,5 @@
+include_directories(./inc)
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(dnslib ${SOURCE})
Propchange: branches/cmake-bringup/lib/dnslib/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/epsapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/epsapi/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/epsapi/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/epsapi/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,4 @@
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(epsapi ${SOURCE})
Propchange: branches/cmake-bringup/lib/epsapi/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/lsalib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/lsalib/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/lsalib/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/lsalib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,5 @@
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(lsalib ${SOURCE})
Propchange: branches/cmake-bringup/lib/lsalib/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/recyclebin/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/recyclebin/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/recyclebin/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,4 @@
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(recyclebin ${SOURCE})
Propchange: branches/cmake-bringup/lib/recyclebin/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/rossym/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/rossym/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,4 @@
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(rossym ${SOURCE})
Propchange: branches/cmake-bringup/lib/rossym/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/rtl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/rtl/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,4 @@
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(rtl ${SOURCE})
Propchange: branches/cmake-bringup/lib/rtl/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/smlib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/smlib/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/smlib/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,5 @@
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(smlib ${SOURCE})
Propchange: branches/cmake-bringup/lib/smlib/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/lib/tdilib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/tdilib/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/lib/tdilib/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,7 @@
+# FIXFIX: You guys should move this header in include/reactos/libs/iphlpapi!
+include_directories(${REACTOS_SOURCE_DIR}/dll/win32/iphlpapi)
+include_directories(.)
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(tdilib ${SOURCE})
Propchange: branches/cmake-bringup/lib/tdilib/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/cmake-bringup/tools/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.txt?rev=48267&r1=48266&r2=48267&view=diff
==============================================================================
--- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -12,6 +12,7 @@
add_subdirectory(winebuild)
add_subdirectory(unicode)
add_subdirectory(wpp)
+add_subdirectory(wmc)
add_subdirectory(widl)
add_subdirectory(wrc)
Added: branches/cmake-bringup/tools/wmc/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wmc/CMakeLists.txt?rev=48267&view=auto
==============================================================================
--- branches/cmake-bringup/tools/wmc/CMakeLists.txt (added)
+++ branches/cmake-bringup/tools/wmc/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:05:32 2010
@@ -1,0 +1,8 @@
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_executable(wmc ${SOURCE})
+
+add_definitions(-DWINE_UNICODE_API= )
+
+target_link_libraries(wmc unicode)
Propchange: branches/cmake-bringup/tools/wmc/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
More information about the Ros-diffs
mailing list