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

@@ @@ -96,24 +96,29 @@ if(WIN32 AND SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) @@
 	if (ZLIB_LIBRARY)
 		set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${ZLIB_LIBRARY})
 	endif()
 	if (EXPAT_LIBRARY)
 		set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${EXPAT_LIBRARY})
 	endif()
 	if (LIBIDN_LIBRARY)
 		set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${LIBIDN_LIBRARY})
 	endif()
 	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")
 	find_package(Swiften)
 endif()
 if (WIN32)
 	add_definitions(-DSWIFTEN_STATIC=1)
 	ADD_DEFINITIONS(-D_UNICODE)
 	ADD_DEFINITIONS(-DUNICODE)
 endif()

spectrum/src/CMakeLists.txt

➞

Show inline comments

@@ @@ -5,29 +5,25 @@ FILE(GLOB SRC *.cpp) @@
 # FILE(GLOB WIN_SRC win32/*.cpp)
 # include_directories(win32)
 # ADD_EXECUTABLE(spectrum2 ${SRC} ${WIN_SRC})
 # else()
 ADD_EXECUTABLE(spectrum2 ${SRC})
 # endif()
 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)
 INSTALL(FILES
 	sample2.cfg
 	RENAME spectrum.cfg.example
 	DESTINATION /etc/spectrum2/transports
+	)
 INSTALL(FILES
 	backend-logging.cfg
 	DESTINATION /etc/spectrum2

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -36,25 +36,25 @@ if (PROTOBUF_FOUND) @@
 	ADD_DEPENDENCIES(transport pb)
 else(PROTOBUF_FOUND)
 	ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
 endif(PROTOBUF_FOUND)
 if (CMAKE_COMPILER_IS_GNUCXX)
 	if (NOT WIN32)
 		ADD_DEFINITIONS(-fPIC)
 	endif()
 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
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
+)
 INSTALL(TARGETS transport LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries)
 #CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
 #INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)

0 comments (0 inline, 0 general)