From: Romain Pokrzywka <romain@kdab.com>
Date: Sat, 30 Jan 2010 01:49:37 +0000 (-0800)
Subject: make the def handling simpler with cmake, we don't need to specify the library name... 
X-Git-Tag: dbus-1.3.1~120^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7487915ff4760b476d1b60cb7bfea6c16f99c88e;p=thirdparty%2Fdbus.git

make the def handling simpler with cmake, we don't need to specify the library name anyway
---

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 16166ca46..2eff13e37 100644
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -270,15 +270,13 @@ if(splitlib AND MSVC)
 	endif(MSVC_IDE)
 else(splitlib AND MSVC)
 	# all code into one library
+	if(MSVC)
+		list(APPEND libdbus_SOURCES ${DBUS_DIR}/dbus-1.def)
+	endif(MSVC)
+	
 	add_library(dbus-1 ${DBUS_LIB_TYPE} ${libdbus_SOURCES} ${libdbus_HEADERS} )
 	target_link_libraries(dbus-1 ${LIBS})
 	
-	if(MSVC)
-		set_target_properties(dbus-1  PROPERTIES LINK_FLAGS_RELWITHDEBINFO /def:"${DBUS_DIR}/dbus-1.def.cmake")
-		set_target_properties(dbus-1  PROPERTIES LINK_FLAGS_RELEASE /def:"${DBUS_DIR}/dbus-1.def.cmake")
-		set_target_properties(dbus-1  PROPERTIES LINK_FLAGS_MINSIZEREL /def:"${DBUS_DIR}/dbus-1.def.cmake")
-		set_target_properties(dbus-1  PROPERTIES LINK_FLAGS_DEBUG /def:"${DBUS_DIR}/dbus-1.def.cmake")
-	endif(MSVC)
 	if(MSVC_IDE)	
 		project_source_group(${GROUP_CODE} libdbus_SOURCES libdbus_HEADERS)
 	endif(MSVC_IDE)