Author: jgardou
Date: Fri Apr 1 16:59:14 2011
New Revision: 51219
URL: http://svn.reactos.org/svn/reactos?rev=51219&view=rev
Log:
[CMAKE]
- Do not make an artificial target for gendib generated files.
GENERATED property for source files is there for that and is automatically set
by cmake for custom command OUTPUT files.
Modified:
branches/cmake-bringup/CMakeLists.txt
branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt
Modified: branches/cmake-bringup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=51219&r1=51218&r2=51219&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Fri Apr 1 16:59:14 2011
@@ -200,20 +200,6 @@
add_custom_target(buildno_header ALL DEPENDS
${REACTOS_BINARY_DIR}/include/reactos/buildno.h)
- file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib)
-
- list(APPEND OUTPUT_FILES
- ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib8gen.c
- ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib16gen.c
- ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib32gen.c)
-
- add_custom_command(
- OUTPUT ${OUTPUT_FILES}
- COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib
- DEPENDS native-gendib)
-
- add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})
-
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
#bootcd and livecd
Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt?rev=51219&r1=51218&r2=51219&view=diff
==============================================================================
--- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1]
Fri Apr 1 16:59:14 2011
@@ -12,6 +12,17 @@
add_definitions(
-DLANGPACK
-D_WIN32K_)
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dib)
+
+list(APPEND GENDIB_FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c
+ ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c
+ ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c)
+
+add_custom_command(
+ OUTPUT ${GENDIB_FILES}
+ COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/dib)
list(APPEND SOURCE
dib/alphablend.c
@@ -149,15 +160,8 @@
stubs/stubs.c
stubs/umpdstubs.c
win32k.rc)
-
-list(APPEND GENDIB_GENERATED
- ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c
- ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c
- ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c)
-
-set_source_files_properties(${GENDIB_GENERATED} PROPERTIES GENERATED TRUE)
-
-list(APPEND SOURCE ${GENDIB_GENERATED})
+
+list(APPEND SOURCE ${GENDIB_FILES})
if(ARCH MATCHES i386)
list(APPEND SOURCE
