From 884537fd5f2b3d30f18eb39041416a17bc20962e 2011-09-22 11:25:55
From: HanzZ <hanzz.k@gmail.com>
Date: 2011-09-22 11:25:55
Subject: [PATCH] Find popt library

---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d6c76b0824d12ce605863624c6cf58657ce3699..cc976737cdce30e7b5a8a9ed433814dc9c18cfbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
 
diff --git a/cmake_modules/poptConfig.cmake b/cmake_modules/poptConfig.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..a1a0b2eead36f293864a02e839cc76540728901b
--- /dev/null
+++ b/cmake_modules/poptConfig.cmake
@@ -0,0 +1,10 @@
+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 )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9db9993e932ad47eb08f612d20d03f563a1aa4c3..5c9d61a74642f2eda4632853820bbee15d0cf631 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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}