libtransport.git Changeset - 884537fd5f2b

Changeset - 884537fd5f2b

Parent rev.

Child rev.

[Not reviewed]

0 2 1

HanzZ - 14 years ago 2011-09-22 11:25:55
hanzz.k@gmail.com

Find popt library

3 files changed with 16 insertions and 1 deletions:

CMakeLists.txt

cmake_modules/poptConfig.cmake

src/CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -18,6 +18,9 @@ find_package(purple) @@
 set(glib_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(glib)
 set(popt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(popt)
 set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(event)

cmake_modules/poptConfig.cmake

➞

Show inline comments

@@ new file 100644 @@
 FIND_LIBRARY(POPT_LIBRARY NAMES popt)
 FIND_PATH(POPT_INCLUDE_DIR NAMES "popt.h")
 if( POPT_LIBRARY AND POPT_INCLUDE_DIR )
     message( STATUS "Found popt: ${POPT_LIBRARY}, ${POPT_INCLUDE_DIR}")
     set( POPT_FOUND 1 )
 else( POPT_LIBRARY AND POPT_INCLUDE_DIR )
     message( STATUS "Could NOT find popt" )
 endif( POPT_LIBRARY AND POPT_INCLUDE_DIR )

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -15,12 +15,14 @@ if (CPPUNIT_FOUND) @@
 	target_link_libraries(libtransport_test transport ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES})
 endif()
 include_directories(${POPT_INCLUDE_DIR})
 # SOURCE_GROUP(headers FILES ${HEADERS})
 ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS})
 ADD_DEFINITIONS(-fPIC)
-TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} -lpopt)
+TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
 SET_TARGET_PROPERTIES(transport PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}

0 comments (0 inline, 0 general)