[ros-diffs] [akhaldi] 48442: [CMAKE] - Improve header inclusions.

Author: akhaldi
Date: Tue Aug  3 21:55:42 2010
New Revision: 48442

URL: http://svn.reactos.org/svn/reactos?rev=48442&view=rev
Log:
[CMAKE]
- Improve header inclusions.

Modified:
    branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt
    branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt
    branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt
    branches/cmake-bringup/lib/dnslib/CMakeLists.txt
    branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt
    branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt
    branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt
    branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt
    branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt
    branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt
    branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt
    branches/cmake-bringup/lib/inflib/CMakeLists.txt
    branches/cmake-bringup/lib/newinflib/CMakeLists.txt
    branches/cmake-bringup/lib/recyclebin/CMakeLists.txt
    branches/cmake-bringup/lib/rossym/CMakeLists.txt
    branches/cmake-bringup/lib/rtl/CMakeLists.txt
    branches/cmake-bringup/lib/tdilib/CMakeLists.txt
    branches/cmake-bringup/tools/CMakeLists.txt
    branches/cmake-bringup/tools/gendib/CMakeLists.txt
    branches/cmake-bringup/tools/nci/CMakeLists.txt
    branches/cmake-bringup/tools/rsym/CMakeLists.txt

Modified: 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 [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Tue Aug  3
21:55:42 2010
@@ -1,5 +1,5 @@
-include_directories(./src)
-include_directories(./adns_win32)
+include_directories(src)
+include_directories(adns_win32)
 
 add_definitions(-DADNS_JGAA_WIN32)
 

Modified: branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/expa…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt [iso-8859-1] Tue Aug  3
21:55:42 2010
@@ -1,5 +1,5 @@
-include_directories(.)
-include_directories(./lib)
+
+include_directories(lib)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/expat)
 
 add_definitions(-DHAVE_EXPAT_CONFIG_H)

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] Tue Aug  3
21:55:42 2010
@@ -1,5 +1,5 @@
-include_directories(.)
-include_directories(./include)
+
+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)

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] Tue Aug  3 21:55:42
2010
@@ -1,4 +1,4 @@
-include_directories(./inc)
+include_directories(inc)
 
 add_definitions(-DUNICODE -D_UNICODE)
 

Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/ip/CM…
==============================================================================
--- branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42
2010
@@ -1,7 +1,7 @@
 add_definitions(-D__NTDRIVER__)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include)
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
+include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
 
 file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S)
 file(GLOB_RECURSE SOURCE "*.c")

Modified: branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/oskit…
==============================================================================
--- branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] Tue Aug  3
21:55:42 2010
@@ -1,9 +1,9 @@
 
-include_directories(BEFORE include/freebsd)
-include_directories(BEFORE include/freebsd/sys/include)
 include_directories(BEFORE include/freebsd/src/sys)
-include_directories(BEFORE include/freebsd/dev/include)
-include_directories(BEFORE include/freebsd/net/include)
+include_directories(include/freebsd)
+include_directories(include/freebsd/sys/include)
+include_directories(include/freebsd/dev/include)
+include_directories(include/freebsd/net/include)
 
 include_directories(include)
 

Modified: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound…
==============================================================================
--- branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Tue
Aug  3 21:55:42 2010
@@ -2,7 +2,6 @@
 add_definitions(-D__NTDRIVER__)
 add_definitions(-DKERNEL)
 
-include_directories(.)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
 file(GLOB_RECURSE SOURCE "*.c")

Modified: branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ntfslib…
==============================================================================
--- branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] Tue Aug  3
21:55:42 2010
@@ -1,4 +1,3 @@
 
-include_directories(.)
 file(GLOB_RECURSE SOURCE "*.c")
 add_library(ntfslib ${SOURCE})

Modified: branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatlib…
==============================================================================
--- branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Tue Aug  3
21:55:42 2010
@@ -1,5 +1,4 @@
 
-include_directories(.)
 file(GLOB_RECURSE SOURCE "*.c")
 add_library(vfatlib ${SOURCE})
 add_dependencies(vfatlib psdk)

Modified: branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatxli…
==============================================================================
--- branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Tue Aug  3
21:55:42 2010
@@ -1,4 +1,3 @@
 
-include_directories(.)
 file(GLOB_RECURSE SOURCE "*.c")
 add_library(vfatxlib ${SOURCE})

Modified: branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/host/wcsfuncs…
==============================================================================
--- branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] Tue Aug  3
21:55:42 2010
@@ -1,5 +1,4 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
-
 add_library(host_wcsfuncs ${SOURCE})
 

Modified: branches/cmake-bringup/lib/inflib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/inflib/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42
2010
@@ -1,4 +1,3 @@
-include_directories(.)
 
 SET(GLOBAL_FILES infcore.c infget.c infput.c)
 

Modified: branches/cmake-bringup/lib/newinflib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMa…
==============================================================================
--- branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42
2010
@@ -1,4 +1,3 @@
-include_directories(.)
 
 SET(GLOBAL_FILES infcore.c infget.c infput.c)
 

Modified: branches/cmake-bringup/lib/recyclebin/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/recyclebin/CM…
==============================================================================
--- branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42
2010
@@ -1,4 +1,3 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
-
 add_library(recyclebin ${SOURCE})

Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42
2010
@@ -1,6 +1,4 @@
 
 add_definitions(-D_NTSYSTEM_)
-
 file(GLOB_RECURSE SOURCE "*.c")
-
 add_library(rossym ${SOURCE})

Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList…
==============================================================================
--- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42 2010
@@ -1,5 +1,3 @@
-
-include_directories(.)
 
 add_definitions(-D_NTOSKRNL_)
 add_definitions(-DNO_RTL_INLINES)

Modified: branches/cmake-bringup/lib/tdilib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/tdilib/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42
2010
@@ -1,6 +1,5 @@
 # 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")
 

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] Tue Aug  3 21:55:42 2010
@@ -12,4 +12,4 @@
 add_subdirectory(wpp)
 #add_subdirectory(wmc)
 add_subdirectory(widl)
-#add_subdirectory(wry)
+#add_subdirectory(wrc)

Modified: branches/cmake-bringup/tools/gendib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/gendib/CMak…
==============================================================================
--- branches/cmake-bringup/tools/gendib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/gendib/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42
2010
@@ -1,4 +1,3 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
-
 add_executable(gendib ${SOURCE})

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] Tue Aug  3 21:55:42 2010
@@ -1,4 +1,3 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
-
 add_executable(nci ${SOURCE})

Modified: branches/cmake-bringup/tools/rsym/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/rsym/CMakeL…
==============================================================================
--- branches/cmake-bringup/tools/rsym/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/rsym/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:55:42
2010
@@ -1,4 +1,3 @@
 
 add_executable(rsym rsym_common.c rsym.c)
-
 add_executable(raddr2line rsym_common.c raddr2line.c)