libtransport.git Changeset - 8b9a06aa7248

Changeset - 8b9a06aa7248

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 14 years ago 2011-06-16 23:49:07
hanzz.k@gmail.com

Don't link against swiften-config stuff

2 files changed with 13 insertions and 13 deletions:

cmake_modules/SwiftenConfig.cmake

spectrum/src/CMakeLists.txt

0 comments (0 inline, 0 general)

cmake_modules/SwiftenConfig.cmake

➞

Show inline comments

@@ @@ -2,18 +2,18 @@ FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften) @@
 FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften.h" PATH_SUFFIXES libSwiften Swiften )
 if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable")
 	set( SWIFTEN_CFLAGS "" )
 	if (SWIFTEN_CONFIG_EXECUTABLE)
 		execute_process(
 			COMMAND swiften-config --libs
 			OUTPUT_VARIABLE SWIFTEN_LIBRARY)
 		execute_process(
 			COMMAND swiften-config --cflags
 			OUTPUT_VARIABLE SWIFTEN_CFLAGS)
 		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
 		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
 	endif()
 # 	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable")
 # 	set( SWIFTEN_CFLAGS "" )
 # 	if (SWIFTEN_CONFIG_EXECUTABLE)
 # 		execute_process(
 # 			COMMAND swiften-config --libs
 # 			OUTPUT_VARIABLE SWIFTEN_LIBRARY)
 # 		execute_process(
 # 			COMMAND swiften-config --cflags
 # 			OUTPUT_VARIABLE SWIFTEN_CFLAGS)
 # 		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
 # 		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
 # 	endif()
 	set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR}/.. )
 	message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}")

spectrum/src/CMakeLists.txt

➞

Show inline comments

@@ @@ -6,7 +6,7 @@ ADD_EXECUTABLE(spectrum2 ${SRC}) @@
 ADD_DEPENDENCIES(spectrum2 libpurple_backend)
 ADD_DEPENDENCIES(spectrum2 libircclient-qt_backend)
 target_link_libraries(spectrum2 transport)
+target_link_libraries(spectrum2 transport -lpthread -lssl -lidn -lxml2)
 INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)

0 comments (0 inline, 0 general)