[CMAKE]

- Improve header inclusions.

svn path=/branches/cmake-bringup/; revision=48442

diff --git a/lib/3rdparty/adns/CMakeLists.txt b/lib/3rdparty/adns/CMakeLists.txt
index f8739c3..ac5fb77 100644 (file)
--- a/lib/3rdparty/adns/CMakeLists.txt
+++ b/lib/3rdparty/adns/CMakeLists.txt
@@ -1,5 +1,5 @@
-include_directories(./src)
-include_directories(./adns_win32)
+include_directories(src)
+include_directories(adns_win32)

 
 add_definitions(-DADNS_JGAA_WIN32)
 
 
 add_definitions(-DADNS_JGAA_WIN32)
 

diff --git a/lib/3rdparty/expat/CMakeLists.txt b/lib/3rdparty/expat/CMakeLists.txt
index 3d2cdcb..1b0aa41 100644 (file)
--- a/lib/3rdparty/expat/CMakeLists.txt
+++ b/lib/3rdparty/expat/CMakeLists.txt
@@ -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)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/expat)
 
 add_definitions(-DHAVE_EXPAT_CONFIG_H)

diff --git a/lib/3rdparty/libxml2/CMakeLists.txt b/lib/3rdparty/libxml2/CMakeLists.txt
index 39d1a28..aaee6c2 100644 (file)
--- a/lib/3rdparty/libxml2/CMakeLists.txt
+++ b/lib/3rdparty/libxml2/CMakeLists.txt
@@ -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)
 
 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)

diff --git a/lib/dnslib/CMakeLists.txt b/lib/dnslib/CMakeLists.txt
index 9aea3dd..f278f07 100644 (file)
--- a/lib/dnslib/CMakeLists.txt
+++ b/lib/dnslib/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(./inc)
+include_directories(inc)

 
 add_definitions(-DUNICODE -D_UNICODE)
 
 
 add_definitions(-DUNICODE -D_UNICODE)
 

diff --git a/lib/drivers/ip/CMakeLists.txt b/lib/drivers/ip/CMakeLists.txt
index f1a5892..e862503 100644 (file)
--- a/lib/drivers/ip/CMakeLists.txt
+++ b/lib/drivers/ip/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_definitions(-D__NTDRIVER__)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include)
 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")
 
 file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S)
 file(GLOB_RECURSE SOURCE "*.c")

diff --git a/lib/drivers/oskittcp/CMakeLists.txt b/lib/drivers/oskittcp/CMakeLists.txt
index abb86bf..521f568 100644 (file)
--- a/lib/drivers/oskittcp/CMakeLists.txt
+++ b/lib/drivers/oskittcp/CMakeLists.txt
@@ -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/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)
 
 
 include_directories(include)
 

diff --git a/lib/drivers/sound/soundblaster/CMakeLists.txt b/lib/drivers/sound/soundblaster/CMakeLists.txt
index 23fd311..c70bc2d 100644 (file)
--- a/lib/drivers/sound/soundblaster/CMakeLists.txt
+++ b/lib/drivers/sound/soundblaster/CMakeLists.txt
@@ -2,7 +2,6 @@
 add_definitions(-D__NTDRIVER__)
 add_definitions(-DKERNEL)
 
 add_definitions(-D__NTDRIVER__)
 add_definitions(-DKERNEL)
 

-include_directories(.)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
 file(GLOB_RECURSE SOURCE "*.c")
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
 file(GLOB_RECURSE SOURCE "*.c")

diff --git a/lib/fslib/ntfslib/CMakeLists.txt b/lib/fslib/ntfslib/CMakeLists.txt
index 44a7ae2..8f42b0b 100644 (file)
--- a/lib/fslib/ntfslib/CMakeLists.txt
+++ b/lib/fslib/ntfslib/CMakeLists.txt
@@ -1,4 +1,3 @@
 
 

-include_directories(.)

 file(GLOB_RECURSE SOURCE "*.c")
 add_library(ntfslib ${SOURCE})
 file(GLOB_RECURSE SOURCE "*.c")
 add_library(ntfslib ${SOURCE})

diff --git a/lib/fslib/vfatlib/CMakeLists.txt b/lib/fslib/vfatlib/CMakeLists.txt
index 6a6c805..1426eff 100644 (file)
--- a/lib/fslib/vfatlib/CMakeLists.txt
+++ b/lib/fslib/vfatlib/CMakeLists.txt
@@ -1,5 +1,4 @@
 
 

-include_directories(.)

 file(GLOB_RECURSE SOURCE "*.c")
 add_library(vfatlib ${SOURCE})
 add_dependencies(vfatlib psdk)
 file(GLOB_RECURSE SOURCE "*.c")
 add_library(vfatlib ${SOURCE})
 add_dependencies(vfatlib psdk)

diff --git a/lib/fslib/vfatxlib/CMakeLists.txt b/lib/fslib/vfatxlib/CMakeLists.txt
index 9edc6bc..1e5e6bc 100644 (file)
--- a/lib/fslib/vfatxlib/CMakeLists.txt
+++ b/lib/fslib/vfatxlib/CMakeLists.txt
@@ -1,4 +1,3 @@
 
 

-include_directories(.)

 file(GLOB_RECURSE SOURCE "*.c")
 add_library(vfatxlib ${SOURCE})
 file(GLOB_RECURSE SOURCE "*.c")
 add_library(vfatxlib ${SOURCE})

diff --git a/lib/host/wcsfuncs/CMakeLists.txt b/lib/host/wcsfuncs/CMakeLists.txt
index 791b9cc..02eb639 100644 (file)
--- a/lib/host/wcsfuncs/CMakeLists.txt
+++ b/lib/host/wcsfuncs/CMakeLists.txt
@@ -1,5 +1,4 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
 
 file(GLOB_RECURSE SOURCE "*.c")

-

 add_library(host_wcsfuncs ${SOURCE})
 
 add_library(host_wcsfuncs ${SOURCE})
 

diff --git a/lib/inflib/CMakeLists.txt b/lib/inflib/CMakeLists.txt
index c8afcc5..390c81b 100644 (file)
--- a/lib/inflib/CMakeLists.txt
+++ b/lib/inflib/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(.)

 
 SET(GLOBAL_FILES infcore.c infget.c infput.c)
 
 
 SET(GLOBAL_FILES infcore.c infget.c infput.c)
 

diff --git a/lib/newinflib/CMakeLists.txt b/lib/newinflib/CMakeLists.txt
index 3968f05..0b1a0b5 100644 (file)
--- a/lib/newinflib/CMakeLists.txt
+++ b/lib/newinflib/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(.)

 
 SET(GLOBAL_FILES infcore.c infget.c infput.c)
 
 
 SET(GLOBAL_FILES infcore.c infget.c infput.c)
 

diff --git a/lib/recyclebin/CMakeLists.txt b/lib/recyclebin/CMakeLists.txt
index a35c28d..1de0a25 100644 (file)
--- a/lib/recyclebin/CMakeLists.txt
+++ b/lib/recyclebin/CMakeLists.txt
@@ -1,4 +1,3 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
 
 file(GLOB_RECURSE SOURCE "*.c")

-

 add_library(recyclebin ${SOURCE})
\ No newline at end of file
 add_library(recyclebin ${SOURCE})
\ No newline at end of file

diff --git a/lib/rossym/CMakeLists.txt b/lib/rossym/CMakeLists.txt
index cadcf8b..97da378 100644 (file)
--- a/lib/rossym/CMakeLists.txt
+++ b/lib/rossym/CMakeLists.txt
@@ -1,6 +1,4 @@
 
 add_definitions(-D_NTSYSTEM_)
 
 add_definitions(-D_NTSYSTEM_)

-

 file(GLOB_RECURSE SOURCE "*.c")
 file(GLOB_RECURSE SOURCE "*.c")

-

 add_library(rossym ${SOURCE})
\ No newline at end of file
 add_library(rossym ${SOURCE})
\ No newline at end of file

diff --git a/lib/rtl/CMakeLists.txt b/lib/rtl/CMakeLists.txt
index ccb95c3..e9783e2 100644 (file)
--- a/lib/rtl/CMakeLists.txt
+++ b/lib/rtl/CMakeLists.txt
@@ -1,6 +1,4 @@
 
 

-include_directories(.)
-

 add_definitions(-D_NTOSKRNL_)
 add_definitions(-DNO_RTL_INLINES)
 add_definitions(-D_NTSYSTEM_)
 add_definitions(-D_NTOSKRNL_)
 add_definitions(-DNO_RTL_INLINES)
 add_definitions(-D_NTSYSTEM_)

diff --git a/lib/tdilib/CMakeLists.txt b/lib/tdilib/CMakeLists.txt
index a65ebcd..760d0a3 100644 (file)
--- a/lib/tdilib/CMakeLists.txt
+++ b/lib/tdilib/CMakeLists.txt
@@ -1,6 +1,5 @@
 # FIXFIX: You guys should move this header in include/reactos/libs/iphlpapi!
 include_directories(${REACTOS_SOURCE_DIR}/dll/win32/iphlpapi) 
 # 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")
 
 
 file(GLOB_RECURSE SOURCE "*.c")