From 7487915ff4760b476d1b60cb7bfea6c16f99c88e Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Fri, 29 Jan 2010 17:49:37 -0800 Subject: [PATCH] make the def handling simpler with cmake, we don't need to specify the library name anyway --- cmake/dbus/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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) -- 2.47.3