From ea3b37d0f8aad328fe4b2fbf42de05c0f909dd7e Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 30 Jan 2011 22:10:55 +0000 Subject: [PATCH] [UUID] Define _MIDL_USE_GUIDDEF_, this causes __decspec(selectany) to be used on the iids. This way we don't need any linker flags to silence warnings and it also fixes errors when linking later. svn path=/branches/cmake-bringup/; revision=50573 --- lib/sdk/uuid/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/sdk/uuid/CMakeLists.txt b/lib/sdk/uuid/CMakeLists.txt index dc85bde2e0a..ed842a4f3e4 100644 --- a/lib/sdk/uuid/CMakeLists.txt +++ b/lib/sdk/uuid/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(-D_MIDL_USE_GUIDDEF_) + list(APPEND IDL_SOURCES # These are the ones that MS uuid contains: # activaut.idl @@ -211,11 +213,5 @@ list(APPEND SOURCE otherguids.c undoc.c) -if(MSVC) - # Disable warning about duplicate symbols. MS uuid lib contains them as well. - # Cmake doesn't handle LINK_FLAGS here - set(CMAKE_C_CREATE_STATIC_LIBRARY " /lib ${CMAKE_CL_NOLOGO} /ignore:4006 /out: ") -endif() - add_library(uuid ${SOURCE}) add_dependencies(uuid psdk)