[sir_richard] 48270: [CMAKE]: Add almost all the 3rdparty libs. The remaining ones are more annoying and will require more handwriting. I'm letting someone else write those out.
Author: sir_richard Date: Mon Jul 26 00:38:25 2010 New Revision: 48270
URL: http://svn.reactos.org/svn/reactos?rev=48270&view=rev Log: [CMAKE]: Add almost all the 3rdparty libs. The remaining ones are more annoying and will require more handwriting. I'm letting someone else write those out.
Added: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt (with props) branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/CMakeLists.txt
Added: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMake... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,13 @@ + +add_subdirectory(adns) +add_subdirectory(bzip2) +add_subdirectory(cardlib) +add_subdirectory(expat) +#add_subdirectory(freetype) # Add files by hand, not with a glob! +add_subdirectory(fullfat) +#add_subdirectory(icu4ros) # Add files by hand, not with a glob?? +add_subdirectory(libsamplerate) +add_subdirectory(libwine) +add_subdirectory(libxml2) +#add_subdirectory(mingw) # Multiple targets, watch out for isstartuplib="true" crt="..." +add_subdirectory(zlib)
Propchange: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns/... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,8 @@ +include_directories(./src) +include_directories(./adns_win32) + +add_definitions(-DADNS_JGAA_WIN32) + +file(GLOB_RECURSE SOURCE "/src/*.c" "./adns_win32/*.c") + +add_library(adns ${SOURCE})
Propchange: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/bzip2... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,6 @@ +add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) + +file(GLOB_RECURSE SOURCE "*.c") +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/bzip2.c ${CMAKE_CURRENT_SOURCE_DIR}/dlltest.c ${CMAKE_CURRENT_SOURCE_DIR}/spewG.c ${CMAKE_CURRENT_SOURCE_DIR}/unzcrash.c) + +add_library(bzip2 ${SOURCE})
Propchange: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/cardl... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,3 @@ +file(GLOB_RECURSE SOURCE "*.cpp") + +add_library(cardlib ${SOURCE})
Propchange: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/expat... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,9 @@ +include_directories(.) +include_directories(./lib) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/expat) + +add_definitions(-DHAVE_EXPAT_CONFIG_H) +file(GLOB_RECURSE SOURCE "lib/*.c") +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/lib/xmltok_impl.c ${CMAKE_CURRENT_SOURCE_DIR}/lib/xmltok_ns.c) + +add_library(expat ${SOURCE})
Propchange: branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/fullf... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,6 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat) + +add_definitions(-D__NTDRIVER__) +file(GLOB_RECURSE SOURCE "*.c") + +add_library(fullfat ${SOURCE})
Propchange: branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libsa... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,4 @@ +add_definitions(-DHAVE_LRINT -DHAVE_LRINTF) +file(GLOB_RECURSE SOURCE "*.c") + +add_library(libsamplerate ${SOURCE})
Propchange: branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libwi... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,8 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__WINESRC__) + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(wine ${SOURCE}) + +add_library(wineldr loader.c)
Propchange: branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libxm... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,37 @@ +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) +# FIXME: workarounds until we have a proper oldnames library +add_definitions(-Dgetcwd=_getcwd -Dclose=_close -Dwrite=_write -Dread=_read -Dopen=_open) + +file(GLOB_RECURSE SOURCE "*.c") +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/runsuite.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/runtest.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/runxmlconf.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/schematron.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testapi.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testAutomata.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testC14N.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testchar.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testdict.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testdso.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testHTML.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testModule.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testReader.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testrecurse.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testRegexp.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testRelax.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testSAX.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testSchemas.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testThreads.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testThreadsWin32.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testURI.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/testXPath.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/trio.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/trionan.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/triostr.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/xmlint.c) + +add_library(libxml2 ${SOURCE})
Propchange: branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: 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 (added) +++ branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -1,0 +1,18 @@ + +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) + +if(CMAKE_CROSSCOMPILING) + +add_library(zlib ${SOURCE}) + +else() + +add_library(zlibhost ${SOURCE}) + +endif() +
Propchange: branches/cmake-bringup/lib/3rdparty/zlib/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... ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Mon Jul 26 00:38:25 2010 @@ -5,6 +5,7 @@
if(CMAKE_CROSSCOMPILING)
+add_subdirectory(3rdparty) add_subdirectory(atl) add_subdirectory(dnslib) add_subdirectory(epsapi) @@ -18,5 +19,6 @@ else()
add_subdirectory(host/wcsfuncs) +add_subdirectory(3rdparty/zlib)
endif()
-
sir_richard＠svn.reactos.org