From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 22 Nov 2010 12:57:51 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~444
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=c9032b29c8d5be848fabb12533f8c30cba0803f4;hp=674c35dcd7e77ff7f7ce145ab08da61ef7ffaaae

[CMAKE]
Don't automatically create and link manifest files on MSVC

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

diff --git a/cmake/Platform/Windows-cl.cmake b/cmake/Platform/Windows-cl.cmake
index dcceae51e96..6bdbaec17cd 100644
--- a/cmake/Platform/Windows-cl.cmake
+++ b/cmake/Platform/Windows-cl.cmake
@@ -196,14 +196,14 @@ ENDIF()
 # default to Debug builds
 IF(MSVC_VERSION GREATER 1310)
   # for 2005 make sure the manifest is put in the dll with mt
-  SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
-  SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}")
+#  SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
+#  SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}")
   # create a C shared library
-  SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
+#  SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
   # create a C shared module just copy the shared library rule
-  SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
-  SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}")
-  SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}")
+#  SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
+#  SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}")
+#  SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}")
 
   SET(CMAKE_BUILD_TYPE_INIT Debug)