libtransport.git Changeset - 27004b5fc73e

Changeset - 27004b5fc73e

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Vitaly Takmazov - 13 years ago 2012-04-16 12:21:55
vitalyster@gmail.com

fix compilation 4

3 files changed with 12 insertions and 6 deletions:

CMakeLists.txt

cmake_modules/CommuniConfig.cmake

src/CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -48,6 +48,7 @@ find_package(Swiften) @@
 if (CMAKE_COMPILER_IS_GNUCXX)
 set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(openssl)
 endif()
 set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 if (WIN32)

cmake_modules/CommuniConfig.cmake

➞

Show inline comments

-find_package(Qt4 REQUIRED)
 find_package(Qt4)
 include( ${QT_USE_FILE} )
 FIND_LIBRARY(IRC_LIBRARY NAMES Communi PATHS ${QT_LIBRARY_DIR})

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -44,11 +44,16 @@ if (CMAKE_COMPILER_IS_GNUCXX) @@
 	endif()
 endif()
 if (WIN32)
 	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
 else (WIN32)
 	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
 endif(WIN32)
 if (NOT CMAKE_COMPILER_IS_GNUCXX)
 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/protobuf/libprotobuf")
 	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 libprotobuf ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
 else ()
 	if (WIN32)
 		TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARIES})
 	else()
 		TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
 	endif()
 endif()
 SET_TARGET_PROPERTIES(transport PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}

0 comments (0 inline, 0 general)