libtransport.git Changeset - e144f1a1f2ba

Changeset - e144f1a1f2ba

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 13 years ago 2012-09-04 18:25:56
hanzz.k@gmail.com

Use win32 specific libs in SWIFTEN_LIBRARY

3 files changed with 7 insertions and 6 deletions:

CMakeLists.txt

spectrum/src/CMakeLists.txt

src/CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -105,6 +105,11 @@ if(WIN32 AND SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) @@
 	if (LIBXML_LIBRARY)
 		set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${LIBXML_LIBRARY})
 	endif()
 	set(SWIFTEN_LIBRARY Dnsapi)
 	set(SWIFTEN_LIBRARY Crypt32)
 	set(SWIFTEN_LIBRARY Secur32)
 	set(SWIFTEN_LIBRARY Iphlpapi)
 	set(SWIFTEN_LIBRARY Winscard)
 	message(STATUS "Using swiften: ${SWIFTEN_INCLUDE_DIR} ${SWIFTEN_LIBRARY}")
 else()
 	set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

spectrum/src/CMakeLists.txt

➞

Show inline comments

@@ @@ -14,11 +14,7 @@ ADD_EXECUTABLE(spectrum2 ${SRC}) @@
 ADD_DEPENDENCIES(spectrum2 spectrum2_libpurple_backend)
 ADD_DEPENDENCIES(spectrum2 spectrum2_libircclient-qt_backend)
 if (WIN32)
 target_link_libraries(spectrum2 transport ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} Dnsapi Crypt32 Secur32 Iphlpapi Winscard)
 else()
 target_link_libraries(spectrum2 transport ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY})
 endif()
 INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -45,9 +45,9 @@ if (CMAKE_COMPILER_IS_GNUCXX) @@
 endif()
 if (WIN32)
-	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARIES} ${PROTOBUF_LIBRARY})
 	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY})
 else()
-	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
+	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY})
 endif()
 SET_TARGET_PROPERTIES(transport PROPERTIES

0 comments (0 inline, 0 general)