From b37bd6524ff33079424d861c831d5c38a53c2d93 2011-06-14 12:48:32 From: Jan Kaluza Date: 2011-06-14 12:48:32 Subject: [PATCH] removed hardcoded libraries --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6153a1f3a157344c2fe088db2dd34a17a367485d..b6fd25a190ec404b07c24e9bf20f0abb9ba49b1d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,7 @@ endif() ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS}) ADD_DEFINITIONS(-fPIC) -TARGET_LINK_LIBRARIES(transport -lresolv -lidn -lz -lpthread -lexpat -lidn -lz -lssl -lcrypto -lexpat -lresolv -lc -lxml2 ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES}) +TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES}) SET_TARGET_PROPERTIES(transport PROPERTIES VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION} diff --git a/tests/login/CMakeLists.txt b/tests/login/CMakeLists.txt index d0468bd62021f099a86c8b8ffeacea006ff8d371..d153150f34cef55a9d442d38fd6f4eb89090f298 100644 --- a/tests/login/CMakeLists.txt +++ b/tests/login/CMakeLists.txt @@ -2,5 +2,5 @@ FILE(GLOB SRC *.cpp) ADD_EXECUTABLE(login_test ${SRC}) -TARGET_LINK_LIBRARIES(login_test transport ${SWIFTEN_LIBRARIES} -lgconf-2 -lgobject-2.0 -lglib-2.0) + TARGET_LINK_LIBRARIES(login_test transport ${SWIFTEN_LIBRARIES}) diff --git a/tests/login_bad_name/CMakeLists.txt b/tests/login_bad_name/CMakeLists.txt index 7801614f879ac22f9acab99618852a21d1c73be6..5536b9f736924816d07797357d6a5192e3a967c3 100644 --- a/tests/login_bad_name/CMakeLists.txt +++ b/tests/login_bad_name/CMakeLists.txt @@ -2,5 +2,5 @@ FILE(GLOB SRC *.cpp) ADD_EXECUTABLE(login_bad_name_test ${SRC}) -TARGET_LINK_LIBRARIES(login_bad_name_test transport ${SWIFTEN_LIBRARIES} -lgconf-2 -lgobject-2.0 -lglib-2.0) +TARGET_LINK_LIBRARIES(login_bad_name_test transport ${SWIFTEN_LIBRARIES}) diff --git a/tests/login_bad_name2/CMakeLists.txt b/tests/login_bad_name2/CMakeLists.txt index c437092259788619ede62f5c20b6bf6d941c43a3..41d4f73c0c4acb7fbc66544e828d0575755c191f 100644 --- a/tests/login_bad_name2/CMakeLists.txt +++ b/tests/login_bad_name2/CMakeLists.txt @@ -2,5 +2,5 @@ FILE(GLOB SRC *.cpp) ADD_EXECUTABLE(login_bad_name2_test ${SRC}) -TARGET_LINK_LIBRARIES(login_bad_name2_test transport ${SWIFTEN_LIBRARIES} -lgconf-2 -lgobject-2.0 -lglib-2.0) +TARGET_LINK_LIBRARIES(login_bad_name2_test transport ${SWIFTEN_LIBRARIES})