[ros-diffs] [tkreuzer] 50244: [CMAKE] Fix conflict artifacts.

Author: tkreuzer
Date: Fri Dec 31 16:54:37 2010
New Revision: 50244
URL: http://svn.reactos.org/svn/reactos?rev=50244&view=rev
Log:
[CMAKE]
Fix conflict artifacts.
Modified:
    branches/cmake-bringup/CMakeMacros.cmake
Modified: branches/cmake-bringup/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake…
==============================================================================
--- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Fri Dec 31 16:54:37 2010
@@ -181,13 +181,6 @@
             PROPERTIES GENERATED TRUE)
         list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
         list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl)
-<<<<<<< .mine
-        list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p)
-        add_custom_target(${TARGET}_${FILE}_p
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
-        #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p)
-=======
->>>>>>> .r50241
     endforeach()
     add_custom_command(
@@ -197,12 +190,6 @@
     set_source_files_properties(
         ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
         PROPERTIES GENERATED TRUE)
-<<<<<<< .mine
-
-    add_library(${TARGET}_proxy ${SOURCE})
-    add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})
-=======
->>>>>>> .r50241
 endmacro()
 macro(idl_files)