libtransport.git Changeset - cbd571766ecb

Changeset - cbd571766ecb

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-06-17 00:07:09
hanzz.k@gmail.com

and now it works... we will see...

4 files changed with 12 insertions and 15 deletions:

backends/libircclient-qt/CMakeLists.txt

backends/libpurple/CMakeLists.txt

cmake_modules/SwiftenConfig.cmake

spectrum/src/CMakeLists.txt

0 comments (0 inline, 0 general)

backends/libircclient-qt/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 FILE(GLOB HEADERS *.h)
 QT4_WRAP_CPP(SRC ${HEADERS})
 ADD_EXECUTABLE(spectrum_libircclient-qt_backend ${SRC})
-target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport  -lpthread -lssl -lidn -lxml2)
 target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport)
 INSTALL(TARGETS spectrum_libircclient-qt_backend RUNTIME DESTINATION bin)

backends/libpurple/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(spectrum_libpurple_backend ${SRC})
-target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport  -lpthread -lssl -lidn -lxml2)
 target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport)
 INSTALL(TARGETS spectrum_libpurple_backend RUNTIME DESTINATION bin)

cmake_modules/SwiftenConfig.cmake

➞

Show inline comments

 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)
 		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}")
 	set( SWIFTEN_FOUND 1 )
 else( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
     message( FATAL_ERROR "Could NOT find libSwiften" )

spectrum/src/CMakeLists.txt

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ FILE(GLOB SRC *.cpp) @@
 ADD_EXECUTABLE(spectrum2 ${SRC})
 ADD_DEPENDENCIES(spectrum2 libpurple_backend)
 ADD_DEPENDENCIES(spectrum2 libircclient-qt_backend)
-target_link_libraries(spectrum2 transport -lpthread -lssl -lidn -lxml2)
 target_link_libraries(spectrum2 transport)
 INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)
 INSTALL(FILES
 	sample2.cfg
 	RENAME spectrum.cfg.example

0 comments (0 inline, 0 general)