[akhaldi] 49492: [CMAKE] - Remove wpp from build. - Improve several tools and libs. - Improve the root cmake file.
5 Nov
2010
5 Nov
'10
6:06 p.m.
Author: akhaldi
Date: Fri Nov 5 18:06:25 2010
New Revision: 49492
URL: http://svn.reactos.org/svn/reactos?rev=49492&view=rev
Log:
[CMAKE]
- Remove wpp from build.
- Improve several tools and libs.
- Improve the root cmake file.
Modified:
branches/cmake-bringup/CMakeLists.txt
branches/cmake-bringup/include/reactos/mc/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt
branches/cmake-bringup/lib/cmlib/CMakeLists.txt
branches/cmake-bringup/lib/dnslib/CMakeLists.txt
branches/cmake-bringup/tools/CMakeLists.txt
branches/cmake-bringup/tools/mkhive/CMakeLists.txt
branches/cmake-bringup/tools/nci/CMakeLists.txt
branches/cmake-bringup/tools/unicode/CMakeLists.txt
branches/cmake-bringup/tools/widl/CMakeLists.txt
branches/cmake-bringup/tools/winebuild/CMakeLists.txt
branches/cmake-bringup/tools/wmc/CMakeLists.txt
branches/cmake-bringup/tools/wpp/CMakeLists.txt
branches/cmake-bringup/tools/wrc/CMakeLists.txt
Modified: branches/cmake-bringup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re…
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010
@@ -29,12 +29,13 @@
add_definitions(-DTARGET_i386)
-include_directories(${REACTOS_SOURCE_DIR}/tools/unicode)
-include_directories(include)
-include_directories(include/host)
-include_directories(include/reactos)
-include_directories(include/reactos/wine)
-include_directories(${REACTOS_BINARY_DIR}/include)
+include_directories(
+ ${REACTOS_SOURCE_DIR}/tools/unicode
+ include
+ include/host
+ include/reactos
+ include/reactos/wine
+ ${REACTOS_BINARY_DIR}/include)
add_subdirectory(tools)
add_subdirectory(lib)
@@ -48,12 +49,13 @@
else()
#Some cleanup
-file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt)
-file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt)
-file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt)
-file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt)
-file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab.txt)
-file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt)
+file(REMOVE
+ ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt
+ ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt
+ ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt
+ ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt
+ ${REACTOS_BINARY_DIR}/boot/ros_cab.txt
+ ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt)
#Some useful variables
set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd")
@@ -66,7 +68,7 @@
enable_language(RC)
if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR)
- set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build)
+ set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build)
endif()
set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake"
CACHE FILEPATH "Host executables")
@@ -89,26 +91,27 @@
add_definitions(-D_M_IX86 -D_X86_ -D__i386__)
# Other
-add_definitions(-DUSE_COMPILER_EXCEPTIONS)
-add_definitions(-D_USE_32BIT_TIME_T)
+add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T)
-include_directories(include)
-include_directories(include/psdk)
-include_directories(include/dxsdk)
-include_directories(${REACTOS_BINARY_DIR}/include)
-include_directories(${REACTOS_BINARY_DIR}/include/dxsdk)
-include_directories(${REACTOS_BINARY_DIR}/include/psdk)
-include_directories(${REACTOS_BINARY_DIR}/include/reactos)
-include_directories(include/crt)
+include_directories(
+ include
+ include/psdk
+ include/dxsdk
+ ${REACTOS_BINARY_DIR}/include
+ ${REACTOS_BINARY_DIR}/include/dxsdk
+ ${REACTOS_BINARY_DIR}/include/psdk
+ ${REACTOS_BINARY_DIR}/include/reactos
+ include/crt
+ include/ddk
+ include/ndk
+ include/reactos
+ include/reactos/libs)
+
if(MSVC)
include_directories(include/crt/msc)
else()
include_directories(include/crt/mingw32)
endif(MSVC)
-include_directories(include/ddk)
-include_directories(include/ndk)
-include_directories(include/reactos)
-include_directories(include/reactos/libs)
add_subdirectory(include/psdk)
add_subdirectory(include/dxsdk)
@@ -189,4 +192,3 @@
include(ros_cd.cmake)
endif()
-
Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m…
==============================================================================
--- branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -1,17 +1,17 @@
if(MSVC)
-MACRO(MACRO_MC FILE)
+macro(MACRO_MC FILE)
set (COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h
${REACTOS_BINARY_DIR}/include/reactos
${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc)
-ENDMACRO()
+endmacro()
else()
-MACRO(MACRO_MC FILE)
+macro(MACRO_MC FILE)
set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b
${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc -r
${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos)
-ENDMACRO()
+endmacro()
endif()
-MACRO (MACRO_ADD_MESSAGE_HEADERS)
+macro (MACRO_ADD_MESSAGE_HEADERS)
- FOREACH(_in_FILE ${ARGN})
+ foreach(_in_FILE ${ARGN})
get_filename_component(FILE ${_in_FILE} NAME_WE)
MACRO_MC(${FILE})
@@ -26,9 +26,14 @@
)
add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h
${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc)
- ENDFOREACH(_in_FILE ${ARGN})
+ endforeach(_in_FILE ${ARGN})
-ENDMACRO (MACRO_ADD_MESSAGE_HEADERS)
+endmacro (MACRO_ADD_MESSAGE_HEADERS)
-file(GLOB_RECURSE SOURCE "*.mc")
+list(APPEND SOURCE
+ bugcodes.mc
+ errcodes.mc
+ netevent.mc
+ ntstatus.mc
+ pciclass.mc)
MACRO_ADD_MESSAGE_HEADERS(${SOURCE})
Modified: branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/full…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -1,6 +1,20 @@
+
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat)
add_definitions(-D__NTDRIVER__)
-file(GLOB_RECURSE SOURCE "*.c")
-add_library(fullfat ${SOURCE})
+list(APPEND SOURCE
+ ff_blk.c
+ ff_crc.c
+ ff_dir.c
+ ff_error.c
+ ff_fat.c
+ ff_file.c
+ ff_hash.c
+ ff_ioman.c
+ ff_memory.c
+ ff_safety.c
+ ff_string.c
+ ff_time.c)
+
+add_library(fullfat ${SOURCE})
Modified: branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/icu4…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -1,50 +1,52 @@
-include_directories(icu/source/common)
-include_directories(icu/source/i18n)
-add_definitions(-DHAVE_EXPAT_CONFIG_H)
-add_definitions(-DU_STATIC_IMPLEMENTATION)
-add_definitions(-DU_HAVE_INTTYPES_H)
-add_definitions(-DUCONFIG_NO_FILE_IO=1)
-add_definitions(-DICU_NO_USER_DATA_OVERRIDE=1)
+include_directories(
+ icu/source/common
+ icu/source/i18n)
-set(SOURCE
- "stubs.cpp"
- "icu/source/common/bmpset.cpp"
- "icu/source/common/uhash_us.cpp"
- "icu/source/common/uidna.cpp"
- "icu/source/common/unifilt.cpp"
- "icu/source/common/unifunct.cpp"
- "icu/source/common/uniset.cpp"
- "icu/source/common/unisetspan.cpp"
- "icu/source/common/unistr.cpp"
- "icu/source/common/unorm.cpp"
- "icu/source/common/uobject.cpp"
- "icu/source/common/uobject.cpp"
- "icu/source/common/uset.cpp"
- "icu/source/common/usprep.cpp"
- "icu/source/common/uiter.cpp"
- "icu/source/common/util.cpp"
- "icu/source/common/cmemory.c"
- "icu/source/common/cstring.c"
- "icu/source/common/locmap.c"
- "icu/source/common/punycode.c"
- "icu/source/common/ubidi_props.c"
- "icu/source/common/ucln_cmn.c"
- "icu/source/common/ucmndata.c"
- "icu/source/common/ucol_swp.c"
- "icu/source/common/udata.c"
- "icu/source/common/udatamem.c"
- "icu/source/common/udataswp.c"
- "icu/source/common/uhash.c"
- "icu/source/common/uinit.c"
- "icu/source/common/uinvchar.c"
- "icu/source/common/umapfile.c"
- "icu/source/common/umath.c"
- "icu/source/common/umutex.c"
- "icu/source/common/ustring.c"
- "icu/source/common/ustrtrns.c"
- "icu/source/common/utf_impl.c"
- "icu/source/common/utrie.c"
- )
+add_definitions(
+ -DHAVE_EXPAT_CONFIG_H
+ -DU_STATIC_IMPLEMENTATION
+ -DU_HAVE_INTTYPES_H
+ -DUCONFIG_NO_FILE_IO=1
+ -DICU_NO_USER_DATA_OVERRIDE=1)
-add_library(icu4ros ${SOURCE})
+list(APPEND SOURCE
+ stubs.cpp
+ icu/source/common/bmpset.cpp
+ icu/source/common/uhash_us.cpp
+ icu/source/common/uidna.cpp
+ icu/source/common/unifilt.cpp
+ icu/source/common/unifunct.cpp
+ icu/source/common/uniset.cpp
+ icu/source/common/unisetspan.cpp
+ icu/source/common/unistr.cpp
+ icu/source/common/unorm.cpp
+ icu/source/common/uobject.cpp
+ icu/source/common/uobject.cpp
+ icu/source/common/uset.cpp
+ icu/source/common/usprep.cpp
+ icu/source/common/uiter.cpp
+ icu/source/common/util.cpp
+ icu/source/common/cmemory.c
+ icu/source/common/cstring.c
+ icu/source/common/locmap.c
+ icu/source/common/punycode.c
+ icu/source/common/ubidi_props.c
+ icu/source/common/ucln_cmn.c
+ icu/source/common/ucmndata.c
+ icu/source/common/ucol_swp.c
+ icu/source/common/udata.c
+ icu/source/common/udatamem.c
+ icu/source/common/udataswp.c
+ icu/source/common/uhash.c
+ icu/source/common/uinit.c
+ icu/source/common/uinvchar.c
+ icu/source/common/umapfile.c
+ icu/source/common/umath.c
+ icu/source/common/umutex.c
+ icu/source/common/ustring.c
+ icu/source/common/ustrtrns.c
+ icu/source/common/utf_impl.c
+ icu/source/common/utrie.c)
+
+add_library(icu4ros ${SOURCE})
Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libm…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -1,3 +1,4 @@
+
add_definitions(
-DOPT_I386
-DREAL_IS_FLOAT
Modified: branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libs…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt [iso-8859-1] Fri Nov
5 18:06:25 2010
@@ -1,4 +1,12 @@
-add_definitions(-DHAVE_LRINT -DHAVE_LRINTF)
-file(GLOB_RECURSE SOURCE "*.c")
-add_library(libsamplerate ${SOURCE})
+add_definitions(
+ -DHAVE_LRINT
+ -DHAVE_LRINTF)
+
+list(APPEND SOURCE
+ samplerate.c
+ src_linear.c
+ src_sinc.c
+ src_zoh.c)
+
+add_library(libsamplerate ${SOURCE})
Modified: branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libw…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -1,8 +1,12 @@
+
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_definitions(-D__WINESRC__)
-file(GLOB_RECURSE SOURCE "*.c")
-list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/debug.c)
+list(APPEND SOURCE
+ config.c
+ debug_ros.c
+ loader.c
+ string.c)
add_library(wine ${SOURCE})
Modified: branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libx…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -1,54 +1,63 @@
-include_directories(.)
-include_directories(./include)
-add_definitions(-D__MINGW32__ -DLIBXML_STATIC -D_REENTRANT -DHAVE_WIN32_THREADS -D_MBCS
-D_WINDOWS -DWIN32 -DHAVE_CONFIG_H)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+include_directories(
+ .
+ include)
+
+add_definitions(
+ -D__MINGW32__
+ -DLIBXML_STATIC
+ -D_REENTRANT
+ -DHAVE_WIN32_THREADS
+ -D_MBCS
+ -D_WINDOWS
+ -DWIN32
+ -DHAVE_CONFIG_H
+ -D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE
- c14n.c
- catalog.c
- chvalid.c
- debugXML.c
- dict.c
- DOCBparser.c
- encoding.c
- entities.c
- error.c
- globals.c
- hash.c
- HTMLparser.c
- HTMLtree.c
- legacy.c
- list.c
- nanoftp.c
- nanohttp.c
- parser.c
- parserInternals.c
- pattern.c
- relaxng.c
- SAX.c
- SAX2.c
- threads.c
- tree.c
- uri.c
- valid.c
- xinclude.c
- xlink.c
- xmlIO.c
- xmlmemory.c
- xmlreader.c
- xmlregexp.c
- xmlmodule.c
- xmlsave.c
- xmlschemas.c
- xmlschemastypes.c
- xmlunicode.c
- xmlwriter.c
- xpath.c
- xpointer.c
- xmlstring.c
-)
+ c14n.c
+ catalog.c
+ chvalid.c
+ debugXML.c
+ dict.c
+ DOCBparser.c
+ encoding.c
+ entities.c
+ error.c
+ globals.c
+ hash.c
+ HTMLparser.c
+ HTMLtree.c
+ legacy.c
+ list.c
+ nanoftp.c
+ nanohttp.c
+ parser.c
+ parserInternals.c
+ pattern.c
+ relaxng.c
+ SAX.c
+ SAX2.c
+ threads.c
+ tree.c
+ uri.c
+ valid.c
+ xinclude.c
+ xlink.c
+ xmlIO.c
+ xmlmemory.c
+ xmlreader.c
+ xmlregexp.c
+ xmlmodule.c
+ xmlsave.c
+ xmlschemas.c
+ xmlschemastypes.c
+ xmlunicode.c
+ xmlwriter.c
+ xpath.c
+ xpointer.c
+ xmlstring.c)
add_library(libxml2 ${SOURCE})
target_link_libraries(libxml2 oldnames)
-add_dependencies(libxml2 psdk)
+add_dependencies(libxml2 psdk)
Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -8,35 +8,35 @@
endif(NOT MSVC)
list(APPEND MINGW_COMMON_SOURCE
- _newmode.c
- atonexit.c
- binmode.c
- charmax.c
- cinitexe.c
- CRT_fp10.c
- CRT_fp8.c
- CRT_glob.c
- crt_handler.c
- dllentry.c
- gccmain.c
- gs_support.c
- merr.c
- mingw_helpers.c
- natstart.c
- pesect.c
- pseudo-reloc.c
- pseudo-reloc-list.c
- tlsmcrt.c
- tlsmthread.c
- tlssup.c
- tlsthrd.c
- txtmode.c
- wildcard.c
- xncommod.c
- xthdloc.c
- xtxtmode.c
- ofmt_stub.c
- cxa_pure_virtual.c)
+ _newmode.c
+ atonexit.c
+ binmode.c
+ charmax.c
+ cinitexe.c
+ CRT_fp10.c
+ CRT_fp8.c
+ CRT_glob.c
+ crt_handler.c
+ dllentry.c
+ gccmain.c
+ gs_support.c
+ merr.c
+ mingw_helpers.c
+ natstart.c
+ pesect.c
+ pseudo-reloc.c
+ pseudo-reloc-list.c
+ tlsmcrt.c
+ tlsmthread.c
+ tlssup.c
+ tlsthrd.c
+ txtmode.c
+ wildcard.c
+ xncommod.c
+ xthdloc.c
+ xtxtmode.c
+ ofmt_stub.c
+ cxa_pure_virtual.c)
add_library(mingw_common ${MINGW_COMMON_SOURCE})
Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlp…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -7,37 +7,37 @@
set_cpp()
list(APPEND SOURCE
- src/allocators.cpp
- src/bitset.cpp
- src/codecvt.cpp
- src/collate.cpp
- src/complex.cpp
- src/complex_io.cpp
- src/complex_trig.cpp
- src/ctype.cpp
- src/dll_main.cpp
- src/facets_byname.cpp
- src/fstream.cpp
- src/ios.cpp
- src/iostream.cpp
- src/istream.cpp
- src/locale.cpp
- src/locale_catalog.cpp
- src/locale_impl.cpp
- src/messages.cpp
- src/monetary.cpp
- src/num_get.cpp
- src/num_get_float.cpp
- src/num_put.cpp
- src/num_put_float.cpp
- src/numpunct.cpp
- src/ostream.cpp
- src/sstream.cpp
- src/stdio_streambuf.cpp
- src/string.cpp
- src/strstream.cpp
- src/time_facets.cpp
- src/c_locale.c
- src/cxa.c)
+ src/allocators.cpp
+ src/bitset.cpp
+ src/codecvt.cpp
+ src/collate.cpp
+ src/complex.cpp
+ src/complex_io.cpp
+ src/complex_trig.cpp
+ src/ctype.cpp
+ src/dll_main.cpp
+ src/facets_byname.cpp
+ src/fstream.cpp
+ src/ios.cpp
+ src/iostream.cpp
+ src/istream.cpp
+ src/locale.cpp
+ src/locale_catalog.cpp
+ src/locale_impl.cpp
+ src/messages.cpp
+ src/monetary.cpp
+ src/num_get.cpp
+ src/num_get_float.cpp
+ src/num_put.cpp
+ src/num_put_float.cpp
+ src/numpunct.cpp
+ src/ostream.cpp
+ src/sstream.cpp
+ src/stdio_streambuf.cpp
+ src/string.cpp
+ src/strstream.cpp
+ src/time_facets.cpp
+ src/c_locale.c
+ src/cxa.c)
add_library(stlport ${SOURCE})
Modified: branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/zlib…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Fri Nov 5
18:06:25 2010
@@ -1,18 +1,25 @@
-
-file(GLOB_RECURSE SOURCE "*.c")
-
-LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/minigzip.c)
-LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/example.c)
add_definitions(-DNO_VIZ)
+list(APPEND SOURCE
+ adler32.c
+ compress.c
+ crc32.c
+ deflate.c
+ gzclose.c
+ gzlib.c
+ gzread.c
+ gzwrite.c
+ infback.c
+ inffast.c
+ inflate.c
+ inftrees.c
+ trees.c
+ uncompr.c
+ zutil.c)
+
if(CMAKE_CROSSCOMPILING)
-
add_library(zlib ${SOURCE})
-
else()
-
add_library(zlibhost ${SOURCE})
-
endif()
-
Modified: branches/cmake-bringup/lib/cmlib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/cmlib/CMakeLi…
==============================================================================
--- branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010
@@ -1,18 +1,25 @@
-file(GLOB_RECURSE SOURCE "*.c")
+add_definitions(
+ -D_NTOSKRNL_
+ -D_NTSYSTEM_
+ -DNASSERT)
-add_definitions(-D_NTOSKRNL_ -D_NTSYSTEM_ -DNASSERT)
+list(APPEND SOURCE
+ cminit.c
+ hivebin.c
+ hivecell.c
+ hiveinit.c
+ hivesum.c
+ hivewrt.c)
if(CMAKE_CROSSCOMPILING)
-
add_library(cmlib ${SOURCE})
add_dependencies(cmlib bugcodes)
-
else()
-
-add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DCMLIB_HOST)
+add_definitions(
+ -DWINE_UNICODE_API=
+ -D__NO_CTYPE_INLINES
+ -DCMLIB_HOST)
add_library(cmlibhost ${SOURCE})
target_link_libraries(cmlibhost unicode)
-
endif()
-
Modified: branches/cmake-bringup/lib/dnslib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/dnslib/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/dnslib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/dnslib/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25
2010
@@ -1,7 +1,25 @@
+
include_directories(inc)
add_definitions(-DUNICODE -D_UNICODE)
-file(GLOB_RECURSE SOURCE "*.c")
+list(APPEND SOURCE
+ addr.c
+ debug.c
+ dnsaddr.c
+ dnsutil.c
+ flatbuf.c
+ hostent.c
+ ip6.c
+ memory.c
+ name.c
+ print.c
+ record.c
+ rrprint.c
+ sablob.c
+ straddr.c
+ string.c
+ table.c
+ utf8.c)
-add_library(dnslib ${SOURCE})
+add_library(dnslib ${SOURCE})
Modified: branches/cmake-bringup/tools/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.…
==============================================================================
--- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010
@@ -13,7 +13,7 @@
add_subdirectory(winebuild)
if(NOT MSVC)
#add_subdirectory(rsym)
-add_subdirectory(wpp)
+#add_subdirectory(wpp)
#add_subdirectory(wmc)
add_subdirectory(widl)
#add_subdirectory(wrc)
Modified: branches/cmake-bringup/tools/mkhive/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/mkhive/CMak…
==============================================================================
--- branches/cmake-bringup/tools/mkhive/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/mkhive/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25
2010
@@ -1,3 +1,13 @@
+
+add_definitions(
+ -DMKHIVE_HOST
+ -DWINE_UNICODE_API= )
+
+include_directories(
+ ${REACTOS_SOURCE_DIR}/lib/newinflib
+ ${REACTOS_SOURCE_DIR}/lib/cmlib
+ ${REACTOS_SOURCE_DIR}/lib/rtl)
+
list(APPEND SOURCE
binhive.c
cmi.c
@@ -6,12 +16,5 @@
registry.c
rtl.c)
-add_definitions(-DMKHIVE_HOST)
-add_definitions(-DWINE_UNICODE_API= )
-
-include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib)
-include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib)
-include_directories(${REACTOS_SOURCE_DIR}/lib/rtl)
-
add_executable(mkhive ${SOURCE})
-target_link_libraries(mkhive unicode cmlibhost newinflibhost)
+target_link_libraries(mkhive unicode cmlibhost newinflibhost)
Modified: branches/cmake-bringup/tools/nci/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/nci/CMakeLi…
==============================================================================
--- branches/cmake-bringup/tools/nci/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/nci/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010
@@ -1,3 +1,2 @@
-file(GLOB_RECURSE SOURCE "*.c")
-add_executable(nci ${SOURCE})
+add_executable(nci ncitool.c)
Modified: branches/cmake-bringup/tools/unicode/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/CMa…
==============================================================================
--- branches/cmake-bringup/tools/unicode/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/unicode/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25
2010
@@ -1,9 +1,76 @@
-
-file(GLOB_RECURSE SOURCE "*.c")
-
-LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/fold.c)
-LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/sortkey.c)
add_definitions(-DWINE_UNICODE_API= )
+list(APPEND SOURCE
+ casemap.c
+ compose.c
+ cptable.c
+ mbtowc.c
+ string.c
+ wctomb.c
+ wctype.c
+ utf8.c
+ c_037.c
+ c_424.c
+ c_437.c
+ c_500.c
+ c_737.c
+ c_775.c
+ c_850.c
+ c_852.c
+ c_855.c
+ c_856.c
+ c_857.c
+ c_860.c
+ c_861.c
+ c_862.c
+ c_863.c
+ c_864.c
+ c_865.c
+ c_866.c
+ c_869.c
+ c_874.c
+ c_875.c
+ c_878.c
+ c_932.c
+ c_936.c
+ c_949.c
+ c_950.c
+ c_1006.c
+ c_1026.c
+ c_1250.c
+ c_1251.c
+ c_1252.c
+ c_1253.c
+ c_1254.c
+ c_1255.c
+ c_1256.c
+ c_1257.c
+ c_1258.c
+ c_1361.c
+ c_10000.c
+ c_10006.c
+ c_10007.c
+ c_10029.c
+ c_10079.c
+ c_10081.c
+ c_20866.c
+ c_20932.c
+ c_20127.c
+ c_21866.c
+ c_28591.c
+ c_28592.c
+ c_28593.c
+ c_28594.c
+ c_28595.c
+ c_28596.c
+ c_28597.c
+ c_28598.c
+ c_28599.c
+ c_28600.c
+ c_28603.c
+ c_28604.c
+ c_28605.c
+ c_28606.c)
+
add_library(unicode ${SOURCE})
Modified: branches/cmake-bringup/tools/widl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/widl/CMakeL…
==============================================================================
--- branches/cmake-bringup/tools/widl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/widl/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25
2010
@@ -1,9 +1,24 @@
-file(GLOB_RECURSE SOURCE "*.c")
+list(APPEND SOURCE
+ client.c
+ expr.c
+ hash.c
+ header.c
+ proxy.c
+ server.c
+ typegen.c
+ typelib.c
+ typetree.c
+ utils.c
+ widl.c
+ write_msft.c
+ parser.yy.c
+ parser.tab.c
+ port/mkstemps.c)
# Taken from widl.rbuild
add_definitions(-DINT16=SHORT)
add_executable(widl ${SOURCE})
-target_link_libraries(widl wpp)
+target_link_libraries(widl wpp)
Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/C…
==============================================================================
--- branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25
2010
@@ -9,13 +9,13 @@
res32.c
spec16.c
spec32.c
- utils.c
-)
+ utils.c)
add_definitions(-DEXEEXT=".exe")
if(NOT UNIX)
-add_definitions(-Dpclose=_pclose)
-add_definitions(-Dpopen=_popen)
+add_definitions(
+ -Dpclose=_pclose
+ -Dpopen=_popen)
endif()
if(MSVC)
list(APPEND SOURCE getopt.c getpid.c)
@@ -24,6 +24,6 @@
add_executable(winebuild ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/buildno.h)
-SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES
GENERATED TRUE)
+set_source_files_properties(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES
GENERATED TRUE)
-ADD_DEPENDENCIES(winebuild build_header)
+add_dependencies(winebuild build_header)
Modified: branches/cmake-bringup/tools/wmc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wmc/CMakeLi…
==============================================================================
--- branches/cmake-bringup/tools/wmc/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/wmc/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010
@@ -1,5 +1,11 @@
-file(GLOB_RECURSE SOURCE "*.c")
+list(APPEND SOURCE
+ lang.c
+ mcl.c
+ utils.c
+ wmc.c
+ write.c
+ mcy.tab.c)
add_executable(wmc ${SOURCE})
Modified: branches/cmake-bringup/tools/wpp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wpp/CMakeLi…
==============================================================================
--- branches/cmake-bringup/tools/wpp/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/wpp/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010
@@ -1,8 +1,12 @@
-file(GLOB_RECURSE SOURCE "*.c")
+list(APPEND SOURCE
+ lex.yy.c
+ preproc.c
+ wpp.c
+ ppy.tab.c)
-SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES
GENERATED TRUE)
+set_source_files_properties(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES
GENERATED TRUE)
add_library(wpp ${SOURCE})
-ADD_DEPENDENCIES(wpp build_header)
+add_dependencies(wpp build_header)
Modified: branches/cmake-bringup/tools/wrc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wrc/CMakeLi…
==============================================================================
--- branches/cmake-bringup/tools/wrc/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/wrc/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010
@@ -1,5 +1,16 @@
-file(GLOB_RECURSE SOURCE "*.c")
+list(APPEND SOURCE
+ dumpres.c
+ genres.c
+ newstruc.c
+ readres.c
+ translation.c
+ utils.c
+ wrc.c
+ writeres.c
+ parser.tab.c
+ lex.yy.c
+ port/mkstemps.c)
add_executable(wrc ${SOURCE})
5165
days inactive
5165
days old
0 comments
1 participants
participants (1)
-
akhaldi＠svn.reactos.org