[ros-diffs] [sir_richard] 48259: [CMAKE]: Ignore "build" directory. [CMAKE]: Fix build. [CMAKE]: Generate headers outside the source tree, into intermediate directories.

Author: sir_richard
Date: Sun Jul 25 19:27:03 2010
New Revision: 48259

URL: http://svn.reactos.org/svn/reactos?rev=48259&view=rev
Log:
[CMAKE]: Ignore "build" directory.
[CMAKE]: Fix build.
[CMAKE]: Generate headers outside the source tree, into intermediate directories.

Modified:
    branches/cmake-bringup/   (props changed)
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/include/psdk/CMakeLists.txt
    branches/cmake-bringup/tools/buildno/CMakeLists.txt
    branches/cmake-bringup/tools/unicode/CMakeLists.txt

Propchange: branches/cmake-bringup/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 25 19:27:03 2010
@@ -5,6 +5,7 @@
 obj-*
 output-*
 reactos
+build
 reactos.*
 RosBE-Logs
 *.sln

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] Sun Jul 25 19:27:03 2010
@@ -11,6 +11,7 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/tools/unicode)
 include_directories(./include)
+include_directories(./include/reactos)
 include_directories(./include/reactos/wine)
 
 add_subdirectory(tools)

Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak…
==============================================================================
--- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sun Jul 25 19:27:03
2010
@@ -6,18 +6,18 @@
    GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE)
 
    ADD_CUSTOM_COMMAND(
-     OUTPUT ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h
-     COMMAND widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I.
-I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H
${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h
${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl
+     OUTPUT ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h
+     COMMAND widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I.
-I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H
${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h
${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl
      DEPENDS widl
    )
 
    SET_SOURCE_FILES_PROPERTIES(
-     ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h
+     ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h
      PROPERTIES
      GENERATED TRUE
    )
 
-    ADD_CUSTOM_TARGET(build_${FILE}_idl ALL DEPENDS
${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h)
+    ADD_CUSTOM_TARGET(build_${FILE}_idl ALL DEPENDS
${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h)
 
  ENDFOREACH(_in_FILE ${ARGN})
 

Modified: branches/cmake-bringup/tools/buildno/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/buildno/CMa…
==============================================================================
--- branches/cmake-bringup/tools/buildno/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/buildno/CMakeLists.txt [iso-8859-1] Sun Jul 25 19:27:03
2010
@@ -4,8 +4,8 @@
 
 target_link_libraries(buildno xml)
 
-ADD_CUSTOM_COMMAND(OUTPUT ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h
+ADD_CUSTOM_COMMAND(OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h
                    COMMAND buildno ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h
                    DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h ) 
 
-ADD_CUSTOM_TARGET(build_header ALL DEPENDS
${REACTOS_SOURCE_DIR}/include/reactos/buildno.h)
+ADD_CUSTOM_TARGET(build_header ALL DEPENDS
${REACTOS_BINARY_DIR}/include/reactos/buildno.h)

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] Sun Jul 25 19:27:03
2010
@@ -1,8 +1,8 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
 
-LIST(REMOVE_ITEM SOURCE "fold.c")
-LIST(REMOVE_ITEM SOURCE "sortkey.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= )