[ros-diffs] [akhaldi] 48663: [CMAKE] - Improve handling buildno.h

Author: akhaldi
Date: Tue Aug 31 13:25:10 2010
New Revision: 48663

URL: http://svn.reactos.org/svn/reactos?rev=48663&view=rev
Log:
[CMAKE]
- Improve handling buildno.h

Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
    branches/cmake-bringup/tools/buildno/CMakeLists.txt
    branches/cmake-bringup/tools/winebuild/CMakeLists.txt
    branches/cmake-bringup/tools/wpp/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] Tue Aug 31 13:25:10 2010
@@ -21,11 +21,12 @@
 include_directories(include)
 include_directories(include/reactos)
 include_directories(include/reactos/wine)
+include_directories(${REACTOS_BINARY_DIR}/include)
 
 add_subdirectory(tools)
 add_subdirectory(lib)
 
-export(TARGETS widl winebuild nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake
NAMESPACE native- )
+export(TARGETS widl winebuild nci buildno FILE
${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
 
 else()
 
@@ -143,5 +144,11 @@
 ADD_CUSTOM_TARGET(subsystem_napi ALL DEPENDS
${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h)
 ADD_CUSTOM_TARGET(kernel_zw ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S)
 
+file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
+ADD_CUSTOM_COMMAND(OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h
+                   COMMAND native-buildno
${REACTOS_BINARY_DIR}/include/reactos/buildno.h
+                   DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h) 
+ADD_CUSTOM_TARGET(buildno_header ALL DEPENDS
${REACTOS_BINARY_DIR}/include/reactos/buildno.h)
+
 endif()
 

Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit…
==============================================================================
--- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Tue Aug 31
13:25:10 2010
@@ -17,4 +17,4 @@
     ${CMAKE_CURRENT_BINARY_DIR}/acledit.def
     ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a)
 
-add_dependencies(acledit acledit_def psdk)
+add_dependencies(acledit acledit_def psdk buildno_header)

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] Tue Aug 31 13:25:10
2010
@@ -4,8 +4,10 @@
 
 target_link_libraries(buildno xml)
 
+file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
+
 ADD_CUSTOM_COMMAND(OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h
-                   COMMAND buildno ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h
+                   COMMAND buildno ${REACTOS_BINARY_DIR}/include/reactos/buildno.h
                    DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h ) 
 
 ADD_CUSTOM_TARGET(build_header ALL DEPENDS
${REACTOS_BINARY_DIR}/include/reactos/buildno.h)

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] Tue Aug 31 13:25:10
2010
@@ -3,8 +3,8 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
 
-add_executable(winebuild ${SOURCE} ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h)
+add_executable(winebuild ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/buildno.h)
 
-SET_SOURCE_FILES_PROPERTIES(${REACTOS_SOURCE_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)

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] Tue Aug 31 13:25:10 2010
@@ -1,7 +1,7 @@
 
 file(GLOB_RECURSE SOURCE "*.c")
 
-SET_SOURCE_FILES_PROPERTIES(${REACTOS_SOURCE_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})