libtransport.git Changeset - e55aa0234745

Changeset - e55aa0234745

Parent rev.

Child rev.

[Not reviewed]

0 4 1

Kevin Smith - 14 years ago 2011-04-02 23:07:34
git@kismith.co.uk

CMake stuff to find libSwiften.

If you keep things in strange places, set CMAKE_PREFIX_PATH in the environment before running cmake.

5 files changed with 18 insertions and 3 deletions:

CMakeLists.txt

cmake_modules/SwiftenConfig.cmake

examples/server_connect/CMakeLists.txt

examples/usermanager/CMakeLists.txt

src/CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -15,12 +15,15 @@ find_package(purple REQUIRED) @@
 set(glib_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(glib REQUIRED)
 set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(event)
 set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Swiften REQUIRED)
 find_package(Doxygen)
 message("Supported features")
 message("------------------")
 if (SQLITE3_FOUND)
 	ADD_DEFINITIONS(-DWITH_SQLITE)
@@ @@ -55,12 +58,13 @@ SET(TRANSPORT_VERSION 2.0) @@
 SET(PROJECT_VERSION 2.0)
 include_directories(include)
 include_directories(${PURPLE_INCLUDE_DIR})
 include_directories(${EVENT_INCLUDE_DIRS})
 include_directories(${GLIB2_INCLUDE_DIR})
 include_directories(${SWIFTEN_INCLUDE_DIR})
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(examples)
 ADD_SUBDIRECTORY(spectrum)

cmake_modules/SwiftenConfig.cmake

➞

Show inline comments

@@ new file 100644 @@
 FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften)
 FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften.h" PATH_SUFFIXES libSwiften )
 if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
     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" )
 endif( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )

examples/server_connect/CMakeLists.txt

➞

Show inline comments

 FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(transport_server_connect ${SRC})
 TARGET_LINK_LIBRARIES(transport_server_connect transport)
+TARGET_LINK_LIBRARIES(transport_server_connect transport ${SWIFTEN_LIBRARIES})

examples/usermanager/CMakeLists.txt

➞

Show inline comments

 FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(transport_usermanager ${SRC})
 TARGET_LINK_LIBRARIES(transport_usermanager transport)
+TARGET_LINK_LIBRARIES(transport_usermanager transport ${SWIFTEN_LIBRARIES})

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ FILE(GLOB HEADERS ../../include/transport/*.h) @@
 # SOURCE_GROUP(headers FILES ${HEADERS})
 ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC})
 ADD_DEFINITIONS(-fPIC)
-TARGET_LINK_LIBRARIES(transport -lSwiften -lresolv -lidn -lz -lpthread -lexpat -lidn -lboost_date_time -lboost_system -lboost_filesystem -lboost_program_options -lboost_regex -lboost_thread-mt -lboost_signals -lz -lssl -lcrypto -lexpat -lresolv -lc -lxml2 ${SQLITE3_LIBRARIES})
+TARGET_LINK_LIBRARIES(transport -lresolv -lidn -lz -lpthread -lexpat -lidn -lboost_date_time -lboost_system -lboost_filesystem -lboost_program_options -lboost_regex -lboost_thread-mt -lboost_signals -lz -lssl -lcrypto -lexpat -lresolv -lc -lxml2 ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY})
 SET_TARGET_PROPERTIES(transport PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
+)
 INSTALL(TARGETS transport LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)

0 comments (0 inline, 0 general)