Author: tkreuzer Date: Sun Jan 30 22:10:55 2011 New Revision: 50573
URL: http://svn.reactos.org/svn/reactos?rev=50573&view=rev Log: [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.
Modified: branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt
Modified: branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/uuid/CMake... ============================================================================== --- branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] Sun Jan 30 22:10:55 2011 @@ -1,3 +1,5 @@ + +add_definitions(-D_MIDL_USE_GUIDDEF_)
list(APPEND IDL_SOURCES # These are the ones that MS uuid contains: @@ -211,11 +213,5 @@ 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 "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /ignore:4006 /out:<TARGET> <OBJECTS> ") -endif() - add_library(uuid ${SOURCE}) add_dependencies(uuid psdk)